From: Olof Johansson <olof@lixom.net>
Date: Wed, 30 Jan 2013 02:09:18 +0000 (-0800)
Subject: Merge branch 'zynq/timer' of git://git.xilinx.com/linux-xlnx into next/cleanup
X-Git-Tag: v5.15~20693^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db1c8172eeca18246b3362d86a4567f4049d07d2;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'zynq/timer' of git://git.xilinx.com/linux-xlnx into next/cleanup

From Michal Simek, this is a series of cleanups to timer code on zynq platforms.

* 'zynq/timer' of git://git.xilinx.com/linux-xlnx:
  arm: zynq: timer: Set clock_event cpumask
  arm: zynq: timer: Fix comment style
  arm: zynq: timer: Remove redundant #includes
  arm: zynq: timer: Align columns
  arm: zynq: timer: Remove unused #defines
  arm: zynq: timer: Remove unnecessary register write
  arm: zynq: timer: Replace PSS through PS
  arm: zynq: Add missing irqchip.h to common.c
---

db1c8172eeca18246b3362d86a4567f4049d07d2