diff options
author | Len Brown <len.brown@intel.com> | 2009-09-19 06:37:13 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-09-19 06:37:13 +0200 |
commit | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch) | |
tree | c9b941f4798a2accca200b0b01c07353ce5b07e1 /MAINTAINERS | |
parent | Merge branch 'linus' into release (diff) | |
parent | ACPI: Handle CONFIG_ACPI=n better from linux/acpi.h (diff) | |
download | linux-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.tar.xz linux-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.zip |
Merge branch 'sfi-base' into release
Conflicts:
drivers/acpi/power.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions