]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xilinx/arm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 23:52:01 +0000 (10:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 23:52:01 +0000 (10:52 +1100)
commitd23a82f2141e9975a8b895e1cb383a9998fa30b5
treecaaab39de1aa4e35eef0e9eccb5fce78e77b7e52
parentcab551a81c0a8133b82626395a7552f28bc50083
parent42ead3a591aeadb2722753aecf59f2ae63719075
Merge remote-tracking branch 'xilinx/arm-next'

Conflicts:
arch/arm/mach-zynq/common.c