]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'uml/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 00:35:11 +0000 (10:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 00:35:11 +0000 (10:35 +1000)
commit5ef4ae4f20224a814c53830596dd20a6783371e3
tree4018fffb5a48619a80735fdc34810a7c755a7b4d
parent5a68bf9fd3d9e3cc24eb6ecb6fa519c1be5fa65f
parent989e59fa41c5464ab77bf0bf82f32f721430544e
Merge remote-tracking branch 'uml/next'

Conflicts:
arch/um/include/asm/Kbuild
arch/um/include/shared/os.h