summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-05-22 11:32:31 +0200
committerJiri Kosina <jkosina@suse.cz>2012-05-22 11:32:31 +0200
commit56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch)
tree195cdd3973a1288eb84f51f0ec28a947b333c2c5 /drivers/acpi/acpica
parentMerge branches 'device-groups', 'logitech' and 'multitouch' into for-linus (diff)
parentHID: uclogic: Add support for UC-Logic TWHL850 (diff)
downloadlinux-56ccd186f1837dd418cd094f0e96b3196bbab9ef.tar.xz
linux-56ccd186f1837dd418cd094f0e96b3196bbab9ef.zip
Merge branch 'upstream' into for-linus
Conflicts: drivers/hid/hid-core.c
Diffstat (limited to 'drivers/acpi/acpica')
0 files changed, 0 insertions, 0 deletions