diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 07:46:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 07:46:19 -0700 |
| commit | 07db8696f5d484485dde77138ff87d19c8628a75 (patch) | |
| tree | df967ca4a68a3aafcba3cb9f41665b7e3367820e /fs | |
| parent | bd5838b9ccdde2be18f61886c41ccd131414fb04 (diff) | |
| parent | 86a0f04387bfa814618bf0c2c8b203899c4fa5d2 (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:
[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