]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 04:50:07 +0000 (14:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 04:50:07 +0000 (14:50 +1000)
commit036d58bafb8bad844f65fe5bbc1085d7b1f4312f
tree6d7337cb5d7d643fd6a9ab7dfe3e885f8890a785
parentfabc2a8658686c78e3086bdf4fa7a191db886f7c
parent9c051b9800227b474dcd448c0520078a81eb8773
Merge remote-tracking branch 'tip/auto-latest'

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