diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-05 07:56:53 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-05 07:56:53 +0100 |
commit | 71e45bd2f9f30d7aa9f406f55aef98caa628d627 (patch) | |
tree | 67abd492f098f967047cae6e7e14b34af6456cc3 /arch/arm/mach-iop32x/n2100.c | |
parent | Merge tag 'v3.8-rc6' into next/soc (diff) | |
parent | cpuidle: kirkwood: Move out of mach directory (diff) | |
download | linux-71e45bd2f9f30d7aa9f406f55aef98caa628d627.tar.xz linux-71e45bd2f9f30d7aa9f406f55aef98caa628d627.zip |
Merge tag 'drivers_for_v3.9' of git://git.infradead.org/users/jcooper/linux into next/soc
From Jason Cooper:
mvebu drivers for v3.9
- use rtc-mv in mvebu armv7 SoCs
- add pci-e hotplug for kirkwood
Depends on:
- tags/mvebu_fixes_for_v3.8-rc6
* tag 'drivers_for_v3.9' of git://git.infradead.org/users/jcooper/linux:
cpuidle: kirkwood: Move out of mach directory
rtc: Add support of rtc-mv for MVEBU SoCs
ARM: Kirkwood: Support basic hotplug for PCI-E
arm: mvebu: i2c come back in defconfig
arm: plat-orion: fix printing of "MPP config unavailable on this hardware"
Dove: activate GPIO interrupts in DT
Diffstat (limited to 'arch/arm/mach-iop32x/n2100.c')
0 files changed, 0 insertions, 0 deletions