Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse source

* '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_

...

This commit is contained in:

Linus Torvalds 2007-10-03 15:43:36 -07:00

parent c7659e2c13 529d303e07

commit 3e0ca2f148

3 changed files with 2 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/net/sky2.c

View file

2

drivers/net/wireless/bcm43xx/bcm43xx_wx.c

View file

2

net/ieee80211/softmac/ieee80211softmac_wx.c

View file