]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitf4e08d162c1f55fa4f76aa1354b1e2d8eed25a87
treee0fb5432024c3e627d327f0303cf3b72c6602e7a
parent173771013ec841e14d51a93ec241cacec444bb9b
parent989e59fa41c5464ab77bf0bf82f32f721430544e
Merge remote-tracking branch 'uml/next'

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