diff options
author | Len Brown <len.brown@intel.com> | 2008-02-07 09:13:13 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-07 09:13:13 +0100 |
commit | 70ec75c5b8e0bda7a16fb387f91e08545f379a0e (patch) | |
tree | 59a13092f566f89ce2cccbaecff487c82fc02564 /scripts/pnmtologo.c | |
parent | Merge branches 'release' and 'ppc-workaround' into release (diff) | |
parent | acpi: make __acpi_map_table() and __init function (diff) | |
parent | PM: documentation cleanups (diff) | |
download | linux-70ec75c5b8e0bda7a16fb387f91e08545f379a0e.tar.xz linux-70ec75c5b8e0bda7a16fb387f91e08545f379a0e.zip |
Merge branches 'release', 'misc' and 'misc-2.6.25' into release