summaryrefslogtreecommitdiff
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 20:28:24 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 20:28:24 +0400
commit3ae684e1c48e6deedc9b9faff8fa1c391ca8a652 (patch)
tree07082b3239c24799e8aaf2e6a8a0ac059870d34a /drivers/net/tg3.c
parentc4fd308ed62f292518363ea9c6c2adb3c2d95f9d (diff)
parent4bd96a7a8185755b091233b16034c7436cbf57af (diff)
downloadlinux-3ae684e1c48e6deedc9b9faff8fa1c391ca8a652.tar.xz
Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, tboot: Add support for S3 memory integrity protection
Diffstat (limited to 'drivers/net/tg3.c')
0 files changed, 0 insertions, 0 deletions