diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 15:22:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 15:22:58 -0500 |
| commit | 116140b7f5c9182c86a4e419f81684209357aea7 (patch) | |
| tree | 596e6d1a3121c022afd1bf29637b6bc6bb06d086 /drivers/block/ps2esdi.c | |
| parent | 8d610dd52dd1da696e199e4b4545f33a2a5de5c6 (diff) | |
| parent | 8af905b4a403ce74b8d907b50bccc453a58834bc (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] smc91x: Kill off excessive versatile hooks.
[PATCH] myri10ge: update driver version to 1.1.0
[PATCH] myri10ge: fix big_bytes in case of vlan frames
[PATCH] myri10ge: Full vlan frame in small_bytes
[PATCH] myri10ge: drop contiguous skb routines
[PATCH] myri10ge: switch to page-based skb
[PATCH] myri10ge: add page-based skb routines
[PATCH] myri10ge: indentation cleanups
[PATCH] chelsio: working NAPI
[PATCH] MACB: Use __raw register access
[PATCH] MACB: Use struct delayed_work instead of struct work_struct
[PATCH] ucc_geth: Initialize mdio_lock.
[PATCH] ucc_geth: compilation error fixes
Diffstat (limited to 'drivers/block/ps2esdi.c')
0 files changed, 0 insertions, 0 deletions