diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-06-12 17:42:13 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-06-12 17:42:13 +0200 |
| commit | 6341de0527c26ea1eaf7b7918e1df98f99e1a525 (patch) | |
| tree | 5f33d7f3d217f06ed67ac4862878e0ad78aa91ff /drivers/block/paride/pt.c | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
| parent | fa047e4f6fa63a6e9d0ae4d7749538830d14a343 (diff) | |
| parent | 57fd637ad9ac6b13c1c47b9a0ced4ee99bb26e76 (diff) | |
Merge branches 'upstream' and 'ntrig-multitouch' into for-linus