• R
    Merge branch 'orion' into devel · c00d4ffd
    Russell King 提交于
    * 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: NRussell King <rmk+kernel@arm.linux.org.uk>
    c00d4ffd
Makefile 9.5 KB