]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 04:08:28 +0000 (14:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 04:08:28 +0000 (14:08 +1000)
Conflicts:
arch/x86/mm/fault.c

1  2 
Documentation/kernel-parameters.txt
arch/x86/xen/mmu.c

Simple merge
Simple merge