Merge tag 'zynq-cleanup-for-3.11' of git://git.xilinx.com/linux-xlnx into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Jun 2013 23:39:35 +0000 (01:39 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 19 Jun 2013 23:39:35 +0000 (01:39 +0200)
commitf25ac0a2daad4e701864536b99a276d88343ac78
tree6122e80515713ec6bef318b30d3b9b7de75baf83
parentf333c13c9eb0504ff01b7d9c242a9f2f2f2edc7b
parent88cd4e882de73c2e62c38591abfe8c13fcc8386a
Merge tag 'zynq-cleanup-for-3.11' of git://git.xilinx.com/linux-xlnx into next/cleanup

From Michal Simek:

arm: Xilinx Zynq cleanup patches for v3.11

This branch contains two fixes:
- Fix zynq smp code
- Do not specify init_irq ptr

* tag 'zynq-cleanup-for-3.11' of git://git.xilinx.com/linux-xlnx:
  ARM: zynq: Not to rewrite jump code when starting address is 0x0
  ARM: zynq: Remove init_irq declaration in machine description

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