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>
Showing
arch/arm/mach-orion/Kconfig
0 → 100644
arch/arm/mach-orion/Makefile
0 → 100644
arch/arm/mach-orion/common.c
0 → 100644
arch/arm/mach-orion/common.h
0 → 100644
arch/arm/mach-orion/gpio.c
0 → 100644
arch/arm/mach-orion/irq.c
0 → 100644
arch/arm/mach-orion/pci.c
0 → 100644
arch/arm/mach-orion/time.c
0 → 100644
arch/arm/mm/proc-feroceon.S
0 → 100644
include/linux/mv643xx_i2c.h
0 → 100644
Please register or sign in to comment