diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 02:44:12 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 02:44:12 (GMT) |
| commit | db9edfd7e339ca4113153d887e782dd05be5a9eb (patch) | |
| tree | 0a4ba12447a0cabc800adc7e9667d284777b0181 /arch/um | |
| parent | 631b034724364b413e8a52e7c2e03a9d77e4c2b4 (diff) | |
| parent | fd586bacf439f36dea9b9bf6e6133ac87df2730c (diff) | |
| download | linux-fsl-qoriq-db9edfd7e339ca4113153d887e782dd05be5a9eb.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions