summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-10-02 19:27:57 +0400
committerLen Brown <len.brown@intel.com>2009-10-02 19:27:57 +0400
commit6effe5f5773a12f0b1f2c1e1aea9dcf0ee96e7e6 (patch)
tree71a3033e7a4c5367d2bc6c53ef39fd44a9d73d1a /drivers/acpi
parent5e6f9725ace758c11895969d8b8175290b0cbc39 (diff)
parente12ac3d018dd8f20a075f5520209862969146fa6 (diff)
parenta83893ae903ba908b1139fd8455ac93c4e5a2dff (diff)
downloadlinux-6effe5f5773a12f0b1f2c1e1aea9dcf0ee96e7e6.tar.xz
Merge branches 'sony-laptop', 'bugzilla-14247' and 'bugzilla-14271' into release