| commit | db9edfd7e339ca4113153d887e782dd05be5a9eb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Jan 04 18:44:12 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Jan 04 18:44:12 2006 -0800 |
| tree | 0a4ba12447a0cabc800adc7e9667d284777b0181 | |
| parent | 631b034724364b413e8a52e7c2e03a9d77e4c2b4 [diff] | |
| parent | fd586bacf439f36dea9b9bf6e6133ac87df2730c [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 Trivial manual merge fixup for usb_find_interface clashes.