aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-10-09 01:47:35 -0400
committerLen Brown <len.brown@intel.com>2012-10-09 01:47:35 -0400
commitd1d4a81b842db21b144ffd2334ca5eee3eb740f3 (patch)
treefe4fde80d9190292f13d2d48c04ce3ea4fd4f764 /drivers/staging
parenttools/power/acpi/acpidump: remove duplicated include from acpidump.c (diff)
parentACPI: EC: Add a quirk for CLEVO M720T/M730T laptop (diff)
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal (diff)
downloadlinux-dev-d1d4a81b842db21b144ffd2334ca5eee3eb740f3.tar.xz
linux-dev-d1d4a81b842db21b144ffd2334ca5eee3eb740f3.zip
Merge branches 'fixes-for-37', 'ec' and 'thermal' into release