diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 10:40:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 10:40:40 -0700 |
| commit | db7a89db5e3bc6ba131965183577b15fd6fc92cc (patch) | |
| tree | 3379e5ceced69c41b24c68d571a103b71c246b14 /drivers/mtd/ssfdc.c | |
| parent | 2910ca6f8ae69648623b3c05b79be87dd7bda73d (diff) | |
| parent | f662fe5a0b144efadbfc00e8040e603ec318746e (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:
dm9601: Fix receive MTU
mv643xx_eth: Do not modify struct netdev tx_queue_len
qla3xxx: bugfix: Fix VLAN rx completion handling.
qla3xxx: bugfix: Add memory barrier before accessing rx completion.
Diffstat (limited to 'drivers/mtd/ssfdc.c')
0 files changed, 0 insertions, 0 deletions