diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-20 14:07:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-20 14:07:18 -0500 |
| commit | e6a997eda9f76e83b7820b6e71406a43374b9f0f (patch) | |
| tree | 4450ece27c396a57a64dfd784bd2c08ebe82193d /drivers/net/spider_net.h | |
| parent | 9a1d1035631ad8b3edf301b273c30bdfc75de01e (diff) | |
| parent | 280a9ca5d0663b185ddc4443052076c29652a328 (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: fix resume (S2R) broken by Intel microcode module, on A110L
x86 gart: don't complain if no AMD GART found
AMD IOMMU: panic if completion wait loop fails
AMD IOMMU: set cmd buffer pointers to zero manually
x86: re-enable MCE on secondary CPUS after suspend/resume
AMD IOMMU: allocate rlookup_table with __GFP_ZERO
Diffstat (limited to 'drivers/net/spider_net.h')
0 files changed, 0 insertions, 0 deletions