diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 11:33:42 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 11:35:11 +0200 |
| commit | 99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc (patch) | |
| tree | 9dbe8427ee72d1aa2fce24a53df2723c3745e2be /drivers/scsi/tmscsim.c | |
| parent | 56ccd186f1837dd418cd094f0e96b3196bbab9ef (diff) | |
| parent | 44d27f7dfedd9aadc082cda31462f6600f56e4ec (diff) | |
| parent | 4e52b538e31d8eca2dde1f01e0685977c19d006e (diff) | |
| parent | ed13794925786a64b2a21389d40a09e4012c357d (diff) | |
Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus
Conflicts:
drivers/hid/hid-core.c