summaryrefslogtreecommitdiff
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-12-11 02:02:02 -0500
committerLen Brown <len.brown@intel.com>2010-12-11 02:02:02 -0500
commit6cc5615f7c4decd7b6c4da9317d0e0b5fbdf7290 (patch)
tree55a32763c3406573054b8c1189b18b5c1ca0b1e9 /drivers/acpi/osl.c
parenta5dc4f898c2a0f66e2cefada6c687db82ba2fcbc (diff)
parent3138b32d5e0998ba3cbd1c74bdc1887d74c5279b (diff)
parent12b3b5afed67e08aa641d30e57df20dab2e33432 (diff)
parentbec4f22a2dbd5a26079cbddbcadf38f8c7e5381f (diff)
parent12d3206466d2074ef0684aaf7759ae01a0a92560 (diff)
Merge branches 'bugzilla-15418', 'bugzilla-21722', 'bugzilla-22932', 'misc-2.6.37' and 'osi-regression' into release