| commit | dabbe12196c1761bf984dbc993de66e58da6ee1c | |
| author | David Kilroy <kilroyd@googlemail.com> | |
| Wed, 9 Dec 2009 20:12:03 +0000 (9 20:12 +0000) | ||
| committer | David Kilroy <kilroyd@googlemail.com> | |
| Wed, 9 Dec 2009 20:12:03 +0000 (9 20:12 +0000) | ||
| tree | cbb704fa0c30b05e940a00d29c032079785ac54f | treesnapshot (tar.gz zip) |
| parent | 399e1cbd41b110f0b30b68ac0835a3fc053d30bd | commitdiff |
| parent | 81c03a3770e59e1695fde81078c6aad4e77cc05d | commitdiff |
Merge branch 'v2.6.31-usb'
Conflicts:
drivers/net/wireless/orinoco/orinoco_usb.c
Conflicts:
drivers/net/wireless/orinoco/orinoco_usb.c