]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'uml/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 01:54:13 +0000 (11:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 01:54:13 +0000 (11:54 +1000)
commit73bf3bd6a38e73e187de2727d657e7fb9044c595
tree3b885b07ac3186a3075194976c335ed4dda0a5d7
parent781bcabc59e48fec3aef6f4b4fba45d1edf72b18
parent989e59fa41c5464ab77bf0bf82f32f721430544e
Merge remote-tracking branch 'uml/next'

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