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)
commit9c23ad0d4e3ca505549f169b37f7d4e95321d0cc
treec169e6331032ca6db26c381669fca69c464ef563
parent39cd0fbe62708d1ad5a8ff3e25ef8c08327a304d
parent268a820049531b130284943aeeb6ea38fd38e64c
Merge branch 'zynq/core' of git://git.xilinx.com/linux-xlnx into next/dt

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>