aboutsummaryrefslogtreecommitdiff
path: root/include/asm-powerpc/fb.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:07:03 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:07:03 -0500
commit877c357e7511395bc923ec9efc2e8b021a17ed79 (patch)
tree94c32b75a6ff1dff7c845abffb6ba8835e1230d8 /include/asm-powerpc/fb.h
parent488b5ec871191359b9b79262a3d48456dae7ea5f (diff)
parentad3399c378993152f12c23304ee56d7f9108e758 (diff)
parent7c2670bbb53820d0a4fab8d74593eeccd1eef225 (diff)
Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release