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)
commit412bb1c1d5cc7790cf048f7b019caca3bce2fb39
tree8fdbbd080b44a8946cd967f3d42287bff29b980d
parent359d786b0402bac88d5bd6ad5a02c2a773f1b9f9
parent4b83f75a7af388aaf5f79ccf72c37074bc9166da
Merge branch 'picoxcell-next' of git://github.com/jamieiles/linux-2.6-ji into next/cleanup

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>