]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'picoxcell-next' of git://github.com/jamieiles/linux-2.6-ji into next...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 13:28:52 +0000 (15:28 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 13:28:52 +0000 (15:28 +0200)
From Jamie Iles:

* 'picoxcell-next' of git://github.com/jamieiles/linux-2.6-ji:
  ARM: picoxcell: Remove init_irq declaration in machine description
  picoxcell: remove redundant common.h

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

Trivial merge