diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 17:38:05 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-15 17:38:05 +0200 |
| commit | e3abcb25d2aec8411ec1b197712b1085df5bfee3 (patch) | |
| tree | d3bf837e14ab8790c8f5cd414c1d8f1f45afa1ba /arch/arm/mach-pxa/am200epd.c | |
| parent | Merge tag 'tegra-for-4.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: bcm2835: Move the restart/power_off handling to the WDT driver (diff) | |
| download | linux-e3abcb25d2aec8411ec1b197712b1085df5bfee3.tar.xz linux-e3abcb25d2aec8411ec1b197712b1085df5bfee3.zip | |
Merge tag 'rpi-soc-for-armsoc-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi into next/soc
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
Diffstat (limited to 'arch/arm/mach-pxa/am200epd.c')
0 files changed, 0 insertions, 0 deletions