]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'uml/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 02:08:51 +0000 (12:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 02:08:51 +0000 (12:08 +1000)
commita241abc1024fa66bd8ea4daed7cb1b550c4fecc6
treef2ea4d41cef3b80b8853f73459daba299c2223c9
parentc93fca63b5d98a2d7726e405955ff495445ae5d1
parent989e59fa41c5464ab77bf0bf82f32f721430544e
Merge remote-tracking branch 'uml/next'

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