summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-15 15:31:37 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-15 15:31:37 -0700
commitb810cdfcf91d76f603fd48023aede48ced8e6bed (patch)
tree6b2dd0608c0241f29ac1e84fa7b629a1a0f5ceb9 /Makefile
parente7b0d26a86943370c04d6833c6edba2a72a6e240 (diff)
parentd2a900365b8963d7ca46f05d8e7176d1be3cc71d (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: natsemi: Avoid IntrStatus lossage if RX state machine resets. natsemi: Fix NAPI for interrupt sharing natsemi: Consistently use interrupt enable/disable functions NetXen: Fix softlockup seen during hardware access NetXen: Bug fix for Jumbo frames on XG card skge: set mac address bonding fix
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions