]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Nov 2012 15:43:58 +0000 (16:43 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Nov 2012 15:43:58 +0000 (16:43 +0100)
From Nicolas Ferre <nicolas.ferre@atmel.com>:

Two little fixes, one related to the move to sparse irq and
another one fixing the check of a GPIO for USB host overcurrent.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91/usbh: fix overcurrent gpio setup
  ARM: at91/AT91SAM9G45: fix crypto peripherals irq issue due to sparse irq support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge