summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-03-13 06:59:52 +0100
committerLen Brown <len.brown@intel.com>2008-03-13 06:59:52 +0100
commitb4de123a0bc4a3f0c90899864d51299628729952 (patch)
treee5ca53b6d0f6d52f1a15ef99865b545afa08e3fa /kernel/power
parentMerge branches 'release', 'button-sysfs', 'misc', 'mismatch', 'randconfig' an... (diff)
parentACPI: Do not pass NULL to acpi_get_handle() when looking for _EJD (diff)
parentsony-laptop.c: fix off-by-one (diff)
parentacer-wmi: build depends on i8042 (diff)
downloadlinux-b4de123a0bc4a3f0c90899864d51299628729952.tar.xz
linux-b4de123a0bc4a3f0c90899864d51299628729952.zip
Merge branches 'release', 'ejd', 'sony' and 'wmi' into release