]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'dt-rh/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 04:10:26 +0000 (14:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 04:10:26 +0000 (14:10 +1000)
commit07f8b9b64cbfcdd544cab177a1843bf3fa39bb3f
treea65835e7dc1fcf377b4ab87912bed4b8eee120bb
parentda7185371982bb0b1667bae2c0dab76d36adda0d
parent728dd198aa543397c88f6f8e35f4f187b2bbc09d
Merge remote-tracking branch 'dt-rh/for-next'

Conflicts:
Documentation/kernel-parameters.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/kernel-parameters.txt
arch/arm64/Kconfig
arch/x86/Kconfig
include/linux/clk-provider.h
include/linux/of.h