| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | |
| Wed, 25 Jul 2012 05:43:04 +0000 (22:43 -0700) | ||
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | |
| Wed, 25 Jul 2012 05:43:04 +0000 (22:43 -0700) |
| 1 | 2 | |||
|---|---|---|---|---|
| drivers/hid/hid-apple.c | patch | | diff1 | | diff2 | | blob | history |
| drivers/hid/hid-core.c | patch | | diff1 | | diff2 | | blob | history |
| drivers/hid/hid-ids.h | patch | | diff1 | | diff2 | | blob | history |
| drivers/input/joystick/xpad.c | patch | | diff1 | | diff2 | | blob | history |
| drivers/input/mouse/bcm5974.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/hid/hid-apple.c
Simple merge
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/input/joystick/xpad.c
Simple merge
diff --cc drivers/input/mouse/bcm5974.c
Simple merge