diff options
| author | Jiri Kosina <[email protected]> | 2012-05-22 09:32:31 +0000 |
|---|---|---|
| committer | Jiri Kosina <[email protected]> | 2012-05-22 09:32:31 +0000 |
| commit | 56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch) | |
| tree | 195cdd3973a1288eb84f51f0ec28a947b333c2c5 /lib/spinlock_debug.c | |
| parent | Merge branches 'device-groups', 'logitech' and 'multitouch' into for-linus (diff) | |
| parent | HID: uclogic: Add support for UC-Logic TWHL850 (diff) | |
| download | kernel-56ccd186f1837dd418cd094f0e96b3196bbab9ef.tar.gz kernel-56ccd186f1837dd418cd094f0e96b3196bbab9ef.zip | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'lib/spinlock_debug.c')
0 files changed, 0 insertions, 0 deletions