| commit | bda6e783927eb5415428a77075d651de053657f2 | |
| author | David Kilroy <kilroyd@googlemail.com> | |
| Wed, 9 Dec 2009 19:49:34 +0000 (9 19:49 +0000) | ||
| committer | David Kilroy <kilroyd@googlemail.com> | |
| Wed, 9 Dec 2009 19:52:05 +0000 (9 19:52 +0000) | ||
| tree | f4061d550518905e07929c749ff066bf583eb387 | treesnapshot (tar.gz zip) |
| parent | 75403b5d93075d8c8ac9bf242e2ad32ca42d2b25 | commitdiff |
| parent | 8f88fe9d4640fa3344a8620e65a7848190dace0e | commitdiff |
Merge branch 'v2.6.29-usb'
Conflicts:
Makefile
drivers/net/wireless/Makefile
drivers/net/wireless/orinoco/orinoco.c
Conflicts:
Makefile
drivers/net/wireless/Makefile
drivers/net/wireless/orinoco/orinoco.c