summaryrefslogtreecommitdiff
path: root/drivers/net/sungem.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-14 12:20:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-14 12:20:09 -0700
commitef0e9180d3589ad35eefe9be6b239f32719fd548 (patch)
tree16faa86808117bbc87f532b06bd727f27442daba /drivers/net/sungem.h
parent4fc4c3ce0dc1096cbd0daa3fe8f6905cbec2b87e (diff)
parent7f284d3cc96e02468a42e045f77af11e5ff8b095 (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, cacheinfo: Turn off L3 cache index disable feature in virtualized environments x86, k8: Fix build error when K8_NB is disabled x86, amd: Check X86_FEATURE_OSVW bit before accessing OSVW MSRs x86: Fix fake apicid to node mapping for numa emulation
Diffstat (limited to 'drivers/net/sungem.h')
0 files changed, 0 insertions, 0 deletions