]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 04:17:57 +0000 (14:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 04:17:57 +0000 (14:17 +1000)
commitebb4bf10e0a41655e4cb6918f92945b2150d7c47
tree97fee66599cf1fbdeb4e2e19c71c04089a789393
parent5d76614087a4958f731310e4b997b2920fd72ebe
parent9c051b9800227b474dcd448c0520078a81eb8773
Merge remote-tracking branch 'tip/auto-latest'

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