diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-06-27 15:03:13 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-27 15:03:13 +0200 |
commit | 6b9a39de73490abb93a0b48a5e6c417c518f3a59 (patch) | |
tree | 4d24999d1e0cb69213ae32cef8d80b2e5b443cc9 /drivers/nfc | |
parent | 1d54e0895bb413d6151a01fdb6d58d93d888198a (diff) | |
parent | bd2da9ca138e446824a7542b381aed442fef4caa (diff) | |
download | linux-6b9a39de73490abb93a0b48a5e6c417c518f3a59.tar.bz2 |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into next/fixes-non-critical
From Nicolas Ferre:
Several fixes for:
- external irq on non-DT boards
- cpuidle code in some circumstances
- PMC code in relation with PLLB/PLL_UTMI/USB:
mainly for SAMA5D3 and AT91SAM9N12
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91/PMC: use at91_usb_rate() for UTMI PLL
ARM: at91/PMC: fix at91sam9n12 USB FS init
ARM: at91/PMC: at91sam9n12 family has a PLLB
ARM: at91/PMC: sama5d3 family doesn't have a PLLB
ARM: at91: cpuidle: Fix target_residency
ARM: at91: fix at91_extern_irq usage for non-dt boards
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions