]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'uml/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 00:34:24 +0000 (10:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 00:34:24 +0000 (10:34 +1000)
commitbf5ec98f24bbba35cbe37fd32e5cf91a46b688b8
treec7090a64047bcea355d9ab937d5f99e5fb79cdfa
parentbc72be3bc3e976a674f09bc51a46b819f0352f9b
parent989e59fa41c5464ab77bf0bf82f32f721430544e
Merge remote-tracking branch 'uml/next'

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