diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 16:37:51 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 16:37:51 +0400 |
| commit | a3cbe10e474ac8c2c30a151a7812e15e4cfa2775 (patch) | |
| tree | f245dd77a3dede97a80f8369d984334b56220752 /drivers/acpi | |
| parent | fa2bd30159499f441125495ba8d9d57f646ea42a (diff) | |
| parent | 86e6b77eb7cf9ca2e9c7092b4dfd588f0a3307b6 (diff) | |
| download | linux-a3cbe10e474ac8c2c30a151a7812e15e4cfa2775.tar.xz | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions