diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 23:26:08 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 02:15:09 -0700 |
| commit | 22251a9b72c46758254caf3250e6d80ea2b088c8 (patch) | |
| tree | 6ddda34305080e3195cc5fe11d1d39d65dc69cb6 /init/initramfs.c | |
| parent | 48bfdb216ed7a2a75aa2909869f3266b3736f88a (diff) | |
| parent | 89982a181b0783335d79e6e5264a23009aa7c6e9 (diff) | |
Merge branch 'lpc32xx/dt' of git://git.antcom.de/linux-2.6 into next/dt
Roland Stigge <stigge@antcom.de> writes:
this is a rearrangement of all mach-lpc32xx specific patches for device
tree conversion. Please note that:
* It builds upon the i2c-pnx changes (see previous pull request, branch
lpc32xx/i2c)
* Dave Miller gave permission to merge the lpc_eth.c change via arm-soc
(patch 1/8)
The rest of the patches is mach-lpc32xx only.
* 'lpc32xx/dt' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Defconfig update
ARM: LPC32xx: Move common code to common.c
ARM: LPC32xx: Device tree support
ARM: LPC32xx: DTS files for device tree conversion
ARM: LPC32xx: Remove obsolete platform Kconfig
ARM: LPC32xx: clock.c registration adjustment
ARM: LPC32xx: clock.c cleanup
net: Add device tree support to LPC32xx
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'init/initramfs.c')
0 files changed, 0 insertions, 0 deletions