summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-10-25 06:12:27 (GMT)
committerLen Brown <len.brown@intel.com>2010-10-25 06:12:27 (GMT)
commit38add9b4baec61655228d86b8d0caa62f15fd857 (patch)
treea65058a8b2e264f4dc69f50d90892782be6407f0 /drivers/acpi
parentf3ab69a321d08ce123dce8166eabe7fddd94b949 (diff)
parentdab5fff14df2cd16eb1ad4c02e83915e1063fece (diff)
parent557d58687dcdee6bc00c1a8f1fd4e0eac8fefce9 (diff)
parent620e112cfe1c9281c176de8ad1a7691c4eb4950d (diff)
downloadlinux-38add9b4baec61655228d86b8d0caa62f15fd857.tar.xz
Merge branches 'bugzilla-15807', 'bugzilla-15979-v2' and 'bugzilla-19162' into release