aboutsummaryrefslogtreecommitdiff
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-09-14 20:19:06 +0300
committerPekka Enberg <penberg@cs.helsinki.fi>2009-09-14 20:19:06 +0300
commitaceda773606f2506a25b91aaafae87b2e4315834 (patch)
tree6084163c1833f938c7e582ddf983c7748c038024 /include/linux/acpi.h
parent0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a (diff)
parent5086c389cb897c7ad66c1cacd1abb5ffebaa74b2 (diff)
parent8a3d271deb0cc9c2fc47317d8e431046382939c9 (diff)
Merge branches 'slab/cleanups' and 'slab/fixes' into for-linus