projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8db089d d37e449)
Merge branch 'master' into upstream
authorJiri Kosina <jkosina@suse.cz>
Mon, 27 Aug 2012 15:04:24 +0000 (08:04 -0700)
committerJiri Kosina <jkosina@suse.cz>
Mon, 27 Aug 2012 15:05:17 +0000 (08:05 -0700)
Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.

1  2 
drivers/hid/hid-core.c patch | diff1 | diff2 | blob | history
drivers/hid/hid-ids.h patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
Domain: System / Uncategorized;