diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-06-25 18:23:12 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-06-25 18:23:12 +0200 |
| commit | 425981c3741326f242530b8e1b91a54df1e29b0e (patch) | |
| tree | b8a7de71c4d4b8d6d1c121bbac5a992e20943f6c /drivers/hid | |
| parent | 2998c7ec04603b3cc1b437980f3609327d2ab162 (diff) | |
| parent | 4859484b0957ddc7fe3e0fa349d98b0f1c7876bd (diff) | |
| parent | cd667ce24796700e1a0e6e7528efc61c96ff832e (diff) | |
Merge branches 'upstream', 'upstream-fixes' and 'debugfs' into for-next