diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 13:32:31 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 13:32:31 +0400 |
| commit | 56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch) | |
| tree | 195cdd3973a1288eb84f51f0ec28a947b333c2c5 /drivers/parport/parport_gsc.c | |
| parent | b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e (diff) | |
| parent | d1257081aecf44455fcab8675f1d54e8b242faa1 (diff) | |
| download | linux-56ccd186f1837dd418cd094f0e96b3196bbab9ef.tar.xz | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'drivers/parport/parport_gsc.c')
0 files changed, 0 insertions, 0 deletions