| commit | 038b9bdb0ad3f1704206cc4d97068fe24386ac3d | |
| author | David Kilroy <kilroyd@googlemail.com> | |
| Sat, 17 Apr 2010 17:01:17 +0000 (17 18:01 +0100) | ||
| committer | David Kilroy <kilroyd@googlemail.com> | |
| Sat, 17 Apr 2010 17:01:17 +0000 (17 18:01 +0100) | ||
| tree | 198e437c2bd3b18f3facd41ff38ceb1c6f48c346 | treesnapshot (tar.gz zip) |
| parent | dabbe12196c1761bf984dbc993de66e58da6ee1c | commitdiff |
| parent | 6c568a17d2bdb425c802c956529ae93bb13fa928 | commitdiff |
Merge branch 'v2.6.32-usb'
Conflicts:
drivers/net/wireless/orinoco/hermes_dld.c
drivers/net/wireless/orinoco/hw.c
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/orinoco/orinoco.h
drivers/net/wireless/orinoco/orinoco_usb.c
drivers/net/wireless/orinoco/wext.c
Conflicts:
drivers/net/wireless/orinoco/hermes_dld.c
drivers/net/wireless/orinoco/hw.c
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/orinoco/orinoco.h
drivers/net/wireless/orinoco/orinoco_usb.c
drivers/net/wireless/orinoco/wext.c