diff options
| author | Jiri Kosina | 2012-07-24 13:39:00 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2012-07-24 13:39:00 +0200 |
| commit | 929bd380b7aec9f9553b6509af86cdba25e334b8 (patch) | |
| tree | be93cedbcb97aeac0d6dae9f22e5815925b52849 /drivers/hid/Kconfig | |
| parent | b94e3c94aae04a911d61f620f4ff5b575fc196ad (diff) | |
| parent | a6d1bc1d5fb0f6ce817bef188a3d93255db03992 (diff) | |
| parent | 82d069822feaf9bf7eb85d5c9ba9a123ecc8f15f (diff) | |
| parent | 11a5c818ae2b7f8ffa7734fa096ca7e9d37b1216 (diff) | |
| parent | eb055fd0560b9835e9e1a956aa6a83c51a735801 (diff) | |
| parent | 2d8767bb421574dfcf48e4be0751ce7d8f73d5d7 (diff) | |
Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes' and 'upstream' into for-linus