]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 04:13:04 +0000 (15:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 04:13:04 +0000 (15:13 +1100)
commit7e007a8ff7097241d8e4b522c96437a3a8d55001
tree9d58598f96b8e9d982064e27210b4539e3d91cf4
parentedfdb2b52492857074f57a7940a8eca005d1790b
parenta87fd9098b45c4b489fe278149adc668f25d4033
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