]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:43:22 +0000 (14:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:43:22 +0000 (14:43 +1000)
commit32faeec37691eb0263fe60ca4c842939c3a67df5
tree3dad6ed7ce3453e11ddb86b08f7bd9e87c363110
parent7bce94bdbe09bf7ec6a746c3c19064c76ae22d79
parent9c051b9800227b474dcd448c0520078a81eb8773
Merge remote-tracking branch 'tip/auto-latest'

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