Merge branch 'upstream-fixes' into upstream

Browse source

...

This commit is contained in:

John W. Linville 2006-08-02 14:29:40 -04:00

parent 02b311bce9 fde627b54c

commit 4456403f5e

4 changed files with 19 additions and 18 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

4

drivers/net/wireless/zd1211rw/zd_chip.c

View file

10

drivers/net/wireless/zd1211rw/zd_chip.h

View file

16

drivers/net/wireless/zd1211rw/zd_mac.c

View file

7

drivers/net/wireless/zd1211rw/zd_usb.c

View file