]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:57:25 +0000 (09:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:57:25 +0000 (09:57 +1000)
commite496d47dc8be507c0ec26a2dba5a54fa72691bdc
treeb90cd29f9b96ebb7f2be48384adb87ba0b63fdd4
parent7ad88f0d1a136c3c869ad5ca9ab4d56fd8b1638f
parent26c88f930141f0d9e7673af2332ada67b7e8865a
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/include/asm/sections.h
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/powerpc/include/asm/sections.h
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/mm/hash_utils_64.c
drivers/pci/pci.c