diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-12-12 21:41:55 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-12-12 21:41:55 +0100 |
| commit | 818b930bc15077fc00ff16bb22c5df1857f05afa (patch) | |
| tree | d799c1037eb55e5f8bdecf72d5fdd45ab4f57569 /include/uapi/linux/isdn_divertif.h | |
| parent | f9af7b9edccb87d4d80b58687ab63e58f3b64c4c (diff) | |
| parent | b5531318f18b5054c0e4a82beb560a77d85948d8 (diff) | |
| parent | 7a7d6d9c5fcd4b674da38e814cfc0724c67731b2 (diff) | |
| parent | 1b42fc4a2889729c740321eb487f887161e38428 (diff) | |
| parent | 955dca354c3c02850409e773fcbd625ac68dd5e7 (diff) | |
| parent | 68fd32b8228a62ca7f46ed64da8267daad29480b (diff) | |
| parent | 4529eefad087f97b33c0f31984d924b1f15d7bae (diff) | |
Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c