diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-21 12:03:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-21 12:03:32 -0700 |
| commit | 3bda2418b94243d5e43fcfe48d9de70cb0d2423e (patch) | |
| tree | b03a0174f2368e1e5d7a66e28e69ee8875a1c60f /drivers/scsi/aha152x.c | |
| parent | f5beec49636bf8d5a34065c8ab030cd4ea84516f (diff) | |
| parent | bdd01503c3e4e9827df015bc7e440d5498308fdd (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] spidernet: rework tx queue handling
[PATCH] spidernet: bug fix for init code
[PATCH] sky2: NAPI poll fix
[NET] ethtool: fix oops by testing correct struct member
e1000: bump version to 7.1.9-k4
e1000: fix panic on large frame receive when mtu=default
e1000: remove CRC bytes from measured packet length
e1000: Redo netpoll fix to address community concerns
Diffstat (limited to 'drivers/scsi/aha152x.c')
0 files changed, 0 insertions, 0 deletions