diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 11:09:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 11:09:57 -0800 |
| commit | 77a0dd54ba3c86b00ab7079bc3be5d82395ecab2 (patch) | |
| tree | 7260d5349fe78251115decdebf1a8de33e2f14bb /kernel/trace/blktrace.c | |
| parent | d7a5a18190d6f523b5d795bfd73f83cf13a3a383 (diff) | |
| parent | cfa60917f0ba6eca83f41aef3cb4a7dd7736ac9f (diff) | |
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV, BAU: Extend for more than 16 cpus per socket
x86, UV: Fix the effect of extra bits in the hub nodeid register
x86, UV: Add common uv_early_read_mmr() function for reading MMRs
Diffstat (limited to 'kernel/trace/blktrace.c')
0 files changed, 0 insertions, 0 deletions