]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 03:34:20 +0000 (14:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 03:34:20 +0000 (14:34 +1100)
commitb37e6b6940fce0df70c399c56e3b9410b5f03e19
tree7b63f05fead8ad9d9c5d41163065f2b3f41fd45f
parent992b13d7b539c396533a2cf1280b18444210b8e4
parentbf77ec6a6e1b1b030424a3efe4bf94dbf8f07f2e
Merge remote-tracking branch 'edac/linux_next'

Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/cpu/mcheck/mce.c
include/linux/edac.h