diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-09-06 11:58:37 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-09-06 11:58:37 +0200 |
| commit | 63faf15dba4a7d6fb18ed5c45670a152d0c5330b (patch) | |
| tree | d341566c06eb6c3595067433a9817f5381c6cc68 /include/uapi | |
| parent | 75ba899e95217fe9002878edc2777bdd49d908c3 (diff) | |
| parent | 3d7d248cf484fe37595698e0ca31a9bcecc85a42 (diff) | |
| parent | ddf7540e9c3a3d65739daa339c8838fa39cf2758 (diff) | |
| parent | 595e9276ce68791317484ec7f0f9f2e0457c3b34 (diff) | |
| parent | 50c9d75b6f01a337aab728511bc1d2a0a3d7b800 (diff) | |
| parent | f5e4e7fdd57691d5308cf854dd0dbcfd58799e9a (diff) | |
| parent | 27f1d2f9acf2a73cc817addfdb4d4043d0991b87 (diff) | |
| parent | 95f712662d96ef7e50f5ca882c3f83d16f1e28f0 (diff) | |
Merge branches 'for-3.12/devm', 'for-3.12/i2c-hid', 'for-3.12/i2c-hid-dt', 'for-3.12/logitech', 'for-3.12/multitouch-win8', 'for-3.12/trasnport-driver-cleanup', 'for-3.12/uhid', 'for-3.12/upstream' and 'for-3.12/wiimote' into for-linus