]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 01:58:06 +0000 (11:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 01:58:06 +0000 (11:58 +1000)
commit083ca9e98e71c9db4cdcb72b27b34890618edd93
treed4005a6b61cefe7f3faf966c1ac84b19ac3f23df
parent09fb5590bef3609c2d1d7024eb6cdf4aee240536
parent9c051b9800227b474dcd448c0520078a81eb8773
Merge remote-tracking branch 'tip/auto-latest'

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