| commit | 9929ffed889b4861b52ba648a44fa4add945c4d1 | |
| author | Jiri Kosina <jkosina@suse.cz> | |
| Wed, 4 Aug 2010 13:27:54 +0000 (4 15:27 +0200) | ||
| committer | Jiri Kosina <jkosina@suse.cz> | |
| Wed, 4 Aug 2010 13:27:54 +0000 (4 15:27 +0200) | ||
| tree | 3cca02ae6b6616cc9a204b762aab349fcfa3aefe | treesnapshot (tar.gz zip) |
| parent | fc73697bd5bf4efe8b5b2b78ec09e00f967cd055 | commitdiff |
| parent | d5e0a06f17a0ffb0eb08a5bd7b18f00af70d9a12 | commitdiff |
Merge branch 'upstream-fixes' into for-linus
Conflicts:
drivers/hid/hid-ids.h
Conflicts:
drivers/hid/hid-ids.h
| drivers/hid/Kconfig | diff1 | diff2 | blobhistory |
| drivers/hid/hid-core.c | diff1 | diff2 | blobhistory |
| drivers/hid/hid-ids.h | diff1 | diff2 | blobhistory |