]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:38:20 +0000 (15:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:38:20 +0000 (15:38 +1000)
commit013242725225b350e51e11de70f9c417909a8670
tree58416678f3fdef1db28fd3e440ec709e4cd080fe
parent6877a033de7fe3baafeaf96ac4d2466ce0ea9ab5
parent9c051b9800227b474dcd448c0520078a81eb8773
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/x86/mm/fault.c
Documentation/kernel-parameters.txt
arch/x86/xen/mmu.c