aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-30 09:02:33 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-30 09:02:33 -0700
commitaa2d3322989d8fd40fb2e417142c9a029d7831a4 (patch)
tree1ef2c1b1fdd09964a62dd49beba4c0cb84e079d4 /arch/alpha
parentMerge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 (diff)
parentehea: Fixed multi queue RX bug (diff)
downloadlinux-dev-aa2d3322989d8fd40fb2e417142c9a029d7831a4.tar.xz
linux-dev-aa2d3322989d8fd40fb2e417142c9a029d7831a4.zip
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: ehea: Fixed multi queue RX bug sky2: enable IRQ on duplex renegotiation e1000: restore netif_poll_enable call but make sure IRQs are off defxx: Fix the handling of ioremap() failures sky2: program proper register for fiber PHY sky2: checksum offload plus vlan bug sky2: dont set bogus bit in PHY register [PATCH] hostap: Allocate enough tailroom for TKIP [PATCH] softmac: alloc_ieee80211() NULL check [PATCH] ieee80211: fix incomplete error message [PATCH] prism54: fix monitor mode oops
Diffstat (limited to 'arch/alpha')
0 files changed, 0 insertions, 0 deletions