]> 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, 7 Nov 2011 01:35:24 +0000 (12:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 01:35:24 +0000 (12:35 +1100)
commit1bd8035085cd0a12832be806ecf8b3fc1ceab357
treefb9804eef655809396d7f74f6425b60a2d073427
parent9e49409d50658e2364a05bc6addb86a8c9342da5
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/xen/mmu.c