diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 14:45:56 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 14:46:00 +0000 |
| commit | 36225decb417a20abcb0b2c24cdbcb6f1d608f83 (patch) | |
| tree | bc3ec77875ddd37dc6e80fffd83c4e251ad756dd | |
| parent | 678a0222edc9da43a22145d68647500ee85e6c04 (diff) | |
| parent | c20b909be9ba27173294a52d08cab293ec030a2c (diff) | |
| parent | 48a5dedfa78899dad50b3b4ae30f07e27e6591ab (diff) | |
Merge branches 'lpc32xx/mach-lpc32xx-eth' and 'lpc32xx/mach-lpc32xx-usb' of git://git.antcom.de/linux-2.6 into lpc32xx/drivers
* 'lpc32xx/mach-lpc32xx-eth' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Ethernet support
* 'lpc32xx/mach-lpc32xx-usb' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: USB Support
(update to v3.3-rc6)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>