diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-13 19:34:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-13 19:34:23 -0400 |
| commit | 509d4486bd86f17b17f5134d02bc3586569f9678 (patch) | |
| tree | 062984c6837da9a6284deba13b02a52418ebfe98 /kernel/sched_cpupri.h | |
| parent | 0acc1b2afb6ded060b7d6b1b5e6ac8a00ec47547 (diff) | |
| parent | 73cf624d029d776a33d0a80c695485b3f9b36231 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, numa: For each node, register the memory blocks actually used
x86, AMD, MCE thresholding: Fix the MCi_MISCj iteration order
x86, mce, therm_throt.c: Fix missing curly braces in error handling logic
Diffstat (limited to 'kernel/sched_cpupri.h')
0 files changed, 0 insertions, 0 deletions