diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 03:14:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 03:14:34 -0700 |
| commit | 39dcfa552c3fd4179f470e0b1f716db6241e95d1 (patch) | |
| tree | 16eb0514faae29bc3adead91571e28a32fc85489 /drivers/block/ataflop.c | |
| parent | 7f12b72bd8532cbbfb147470f0d902260cea36ce (diff) | |
| parent | 14fb57dccb6e1defe9f89a66f548fcb24c374c1d (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, AMD: Fix ARAT feature setting again
Revert "x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors"
x86, apic: Fix spurious error interrupts triggering on all non-boot APs
x86, mce, AMD: Fix leaving freed data in a list
x86: Fix UV BAU for non-consecutive nasids
x86, UV: Fix NMI handler for UV platforms
Diffstat (limited to 'drivers/block/ataflop.c')
0 files changed, 0 insertions, 0 deletions