]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'uml/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 00:15:42 +0000 (10:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 00:15:42 +0000 (10:15 +1000)
commite1042bb3690a490c3eb935b6ca477b6c455bfb54
treeeb5fdb8ee726a796f078a42e5b836a435431f106
parent51fcdb3904274d659325f479f453c60014f53c50
parent989e59fa41c5464ab77bf0bf82f32f721430544e
Merge remote-tracking branch 'uml/next'

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