Merge branch 'zynq/core' of git://git.xilinx.com/linux-xlnx into next/dt
authorArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 16:38:51 +0000 (18:38 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 16:38:51 +0000 (18:38 +0200)
From Michal Simek <michal.simek@xilinx.com>:

It enables pmu support for zynq.
* 'zynq/core' of git://git.xilinx.com/linux-xlnx:
  arm: zynq: Add support for pmu

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

Trivial merge