diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-03 15:43:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-03 15:43:36 -0700 |
commit | 3e0ca2f148f97c5748f52bcf2a69dd17cb2b1d13 (patch) | |
tree | 10782f75b5b09e9bb738534410af106efb0cf926 /drivers/net/plip.c | |
parent | c7659e2c139d0be4647bef89188a932e0254d709 (diff) | |
parent | 529d303e075aa6d988f30935b8995ffb382ad38e (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:
sky2: jumbo frame regression fix
[PATCH] softmac: Fix compiler-warning
[PATCH] bcm43xx: Correct printk with PFX before KERN_
Diffstat (limited to 'drivers/net/plip.c')
0 files changed, 0 insertions, 0 deletions