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)
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>

Trivial merge