]> 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, 8 Nov 2011 02:19:07 +0000 (13:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Nov 2011 02:19:07 +0000 (13:19 +1100)
commitf992a68f38d6fc0392c5717f771547a164b64f29
tree69f2198bf1ebee2979334313bf3b3d32b58e792d
parent6df154d8b64cefcacba859f2c5ea0eb30c3e286a
parente471db82dae27dc125f6f8f84de2cc1846df48c8
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/x86/kernel/cpu/amd.c
drivers/char/random.c
MAINTAINERS
arch/x86/Kconfig
arch/x86/kernel/vsyscall_64.c
arch/x86/xen/mmu.c