aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-26 07:46:19 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-26 07:46:19 -0700
commit07db8696f5d484485dde77138ff87d19c8628a75 (patch)
treedf967ca4a68a3aafcba3cb9f41665b7e3367820e /fs
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[PATCH] forcedeth: fix initialization (diff)
downloadlinux-dev-07db8696f5d484485dde77138ff87d19c8628a75.tar.xz
linux-dev-07db8696f5d484485dde77138ff87d19c8628a75.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: [PATCH] forcedeth: fix initialization [PATCH] sky2: version 1.2 [PATCH] sky2: reset function can be devinit [PATCH] sky2: use ALIGN() macro [PATCH] sky2: add fake idle irq timer [PATCH] sky2: reschedule if irq still pending [PATCH] bcm43xx: make PIO mode usable [PATCH] bcm43xx: add to MAINTAINERS [PATCH] softmac: fix SIOCSIWAP [PATCH] Fix crash on big-endian systems during scan e1000: Update truesize with the length of the packet for packet split [PATCH] Fix locking in gianfar
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions