Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
authorOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 15:51:06 +0000 (07:51 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 15:51:06 +0000 (07:51 -0800)
From Michal Simek:

* 'arm-next' of git://git.xilinx.com/linux-xlnx:
  zynq: move static peripheral mappings
  zynq: remove use of CLKDEV_LOOKUP
  zynq: use pl310 device tree bindings
  zynq: use GIC device tree bindings
  + Linux 3.7-rc3


Trivial merge