diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:49:32 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:49:32 +0200 |
| commit | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (patch) | |
| tree | ff6e16818194aca66d8ea34f9765067b2a82020a /include/linux/sched.h | |
| parent | bbd128b5acae85b2ef346e95cc5a729ac5252f19 (diff) | |
| parent | 41fa92302be7fa37c5c38e17e2097d3e5e9da13a (diff) | |
Merge branch 'uc-logic' into for-linus
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'include/linux/sched.h')
0 files changed, 0 insertions, 0 deletions