diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 08:25:48 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 08:25:48 (GMT) |
| commit | 52b097fff89b14c0b8b7a7deef1d274889b1886d (patch) | |
| tree | 21eb2e3f9835bcc9d0e418e1630321677bf0e86e /include/acpi | |
| parent | 060195500e0347a6ba8ea89739a9898961eb6f2b (diff) | |
| parent | 060195500e0347a6ba8ea89739a9898961eb6f2b (diff) | |
| parent | 3fa2cdcc45a0176de15cac9dbf4ed2834ebf8932 (diff) | |
| download | linux-fsl-qoriq-52b097fff89b14c0b8b7a7deef1d274889b1886d.tar.xz | |
Merge branches 'release' and 'video' into release
Conflicts:
include/acpi/acpi_bus.h
Signed-off-by: Len Brown <len.brown@intel.com>