| commit | 6f4a82e08ca1e257d5671ae23a8734921fb7b337 | |
| author | David Kilroy <kilroyd@googlemail.com> | |
| Sat, 23 Oct 2010 12:55:46 +0000 (23 13:55 +0100) | ||
| committer | David Kilroy <kilroyd@googlemail.com> | |
| Sat, 23 Oct 2010 12:55:46 +0000 (23 13:55 +0100) | ||
| tree | e92cfaabfa04d805647a771624084de418414fba | treesnapshot (tar.gz zip) |
| parent | 038b9bdb0ad3f1704206cc4d97068fe24386ac3d | commitdiff |
Fix merge issues
The merges from the branches don't appear to have been done
correctly. This commit re-aligns master to the v2.6.32-usb branch.
The merges from the branches don't appear to have been done
correctly. This commit re-aligns master to the v2.6.32-usb branch.
| drivers/net/wireless/orinoco/orinoco_usb.c | diffblobblamehistory |