projects / platform / kernel / linux-arm64.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37d9a8c eb48c9c)
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jan 2011 19:05:21 +0000 (11:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jan 2011 19:05:21 +0000 (11:05 -0800)
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  apic, amd: Make firmware bug messages more meaningful
  mce, amd: Remove goto in threshold_create_device()
  mce, amd: Add helper functions to setup APIC
  mce, amd: Shorten local variables mci_misc_{hi,lo}
  mce, amd: Implement mce_threshold_block_init() helper function

1  2 
arch/x86/kernel/apic/apic.c patch | diff1 | diff2 | blob | history
arch/x86/oprofile/op_model_amd.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/apic/apic.c
Simple merge
diff --cc arch/x86/oprofile/op_model_amd.c
Simple merge
Domain: System / Kernel;