| commit | 66267ee58732bb4c21c7bbba004ee481b8ad2b30 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Nov 06 07:51:06 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Tue Nov 06 07:51:06 2012 -0800 |
| tree | bf7f72e623d7c1ca6472e0a1286e802cd3bff139 | |
| parent | 6ed68a6d83e4497dc33581ccc82b4fa3e7e8226d [diff] | |
| parent | f58007762f537ba13674a3138b3f4c20fff1cba9 [diff] |
Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup 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