]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'uml/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 01:20:00 +0000 (11:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 01:20:00 +0000 (11:20 +1000)
Conflicts:
arch/um/include/asm/Kbuild

1  2 
arch/um/include/shared/os.h

Simple merge