Merge tag 'zynq-cleanup-for-3.12' of git://git.xilinx.com/linux-xlnx into next/cleanup
authorKevin Hilman <khilman@linaro.org>
Tue, 20 Aug 2013 22:04:47 +0000 (15:04 -0700)
committerKevin Hilman <khilman@linaro.org>
Tue, 20 Aug 2013 22:05:31 +0000 (15:05 -0700)
commitc454194612e2e88d470f10b959db8ca0045c99bb
tree04ed22d8791f369a5b130d26f327de7acec24cf8
parent47aad66c2659b8985512b66f87bb5fe7bdc88dff
parentb522877b53cf3f26d7f072616a45e10fe579cd19
Merge tag 'zynq-cleanup-for-3.12' of git://git.xilinx.com/linux-xlnx into next/cleanup

From: Michal Simek:
arm: Xilinx Zynq cleanup patches for v3.12

This branch contains these fixes:
- SLCR cleanup
- Hotplug cleanup

* tag 'zynq-cleanup-for-3.12' of git://git.xilinx.com/linux-xlnx:
  arm: zynq: hotplug: Remove unreachable code
  arm: zynq: slcr: Use read-modify-write for register writes
  arm: zynq: slcr: Clean up #defines
  arm: zynq: slcr: Remove redundant header #includes

Signed-off-by: Kevin Hilman <khilman@linaro.org>