OSDN Git Service

Merge tag 'rpi-soc-for-armsoc-v4.2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 May 2015 15:38:05 +0000 (17:38 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 May 2015 15:38:05 +0000 (17:38 +0200)
Merge "RaspberryPi SoC (mach) changes due for v4.2" from Lee Jones:

* tag 'rpi-soc-for-armsoc-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi:
  ARM: bcm2835: Move the restart/power_off handling to the WDT driver
  ARM: bcm2835: Drop the init_irq() hook
  ARM: bcm2835: Skip doing our own iotable_init() initialization


Trivial merge