Russell King c00d4ffdba Merge branch 'orion' into devel ... * orion: (26 commits) [ARM] Orion: implement power-off method for QNAP TS-109/209 [ARM] Orion: add support for QNAP TS-109/TS-209 [ARM] Orion: I2C support [I2C] i2c-mv64xxx: Don't set i2c_adapter.retries [I2C] Split mv643xx I2C platform support [ARM] Orion: enable CONFIG_RTC_DRV_M41T80 for D-Link DNS-323 [ARM] Orion defconfig [ARM] Orion: add support for Orion/MV88F5181 based D-Link DNS-323 [ARM] Orion: MV88F5181 support bits [ARM] Orion: Buffalo/Revogear Kurobox Pro support [ARM] OrionNAS RD board support [ARM] Orion: support for Marvell Orion-2 (88F5281) Development Board [ARM] Orion: common platform setup for Gigabit Ethernet port [ARM] Orion: platform device registration for UART, USB and NAND [ARM] Orion: system timer support [ARM] Orion edge GPIO IRQ support [ARM] Orion: IRQ support [ARM] Orion: provide GPIO method for enabling hardware assisted blinking [ARM] Orion: GPIO support [ARM] Orion: programable address map support ... Conflicts: arch/arm/Kconfig arch/arm/Makefile Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>		2008-01-28 13:21:30 +00:00
..
4xx_io
8xx_io	[PPC] Fix cpm_dpram_addr returning phys mem instead of virt mem	2007-09-28 10:25:32 -05:00
8260_io
boot	kbuild: restore arch/{ppc/xtensa}/boot cflags	2007-10-20 20:35:23 +02:00
configs	[POWERPC] Remove xmon from ml300 and ml403 defconfig in arch/ppc	2007-12-03 10:08:53 +11:00
kernel	sysctl: kill binary sysctl KERN_PPC_L2CR	2008-01-24 08:07:27 -08:00
lib
mm	[POWERPC] Fix 8xx build breakage due to _tlbie changes	2007-11-20 18:42:00 +11:00
platforms	i2c: the scheduled I2C RTC driver removal	2008-01-27 18:14:45 +01:00
syslib	[I2C] i2c-mv64xxx: Don't set i2c_adapter.retries	2008-01-26 15:04:01 +00:00
xmon
.gitignore
Kconfig	Combine instrumentation menus in kernel/Kconfig.instrumentation	2007-10-19 11:53:54 -07:00
Kconfig.debug
Makefile	kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP	2007-10-15 22:17:25 +02:00