]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into next/fixes-non...
authorArnd Bergmann <arnd@arndb.de>
Thu, 27 Jun 2013 13:03:13 +0000 (15:03 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 27 Jun 2013 13:03:13 +0000 (15:03 +0200)
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>

Trivial merge