| commit | 7426ef52b42ebd54ba85133ffd29132e008a882c | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed May 19 14:04:49 2010 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed May 19 14:04:49 2010 +0200 |
| tree | 5232ca850065baf025e8d7384408b48b4b462c96 | |
| parent | 537b60d17894b7c19a6060feae40299d7109d6e7 [diff] | |
| parent | a8ab5d58b0238b8199cc699b8dff7c5e1da24138 [diff] |
Merge branch 'upstream' into for-linus Conflicts: drivers/hid/hid-wacom.c