diff options
author | Len Brown <len.brown@intel.com> | 2009-01-09 09:37:48 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-01-09 09:37:48 +0100 |
commit | d0302bc62af7983040ea1cd1b5dd2b36e1a6a509 (patch) | |
tree | ef45618ae057e21fff7c82190939fe5f4466cf06 /Documentation/w1 | |
parent | Merge branch 'fujitsu-laptop' into release (diff) | |
parent | ACPI : Use RSDT instead of XSDT by adding boot option of "acpi=rsdt" (diff) | |
download | linux-d0302bc62af7983040ea1cd1b5dd2b36e1a6a509.tar.xz linux-d0302bc62af7983040ea1cd1b5dd2b36e1a6a509.zip |
Merge branch 'misc' into release
Conflicts:
include/acpi/acpixf.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/w1')
0 files changed, 0 insertions, 0 deletions