diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 04:37:13 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 04:37:13 (GMT) |
| commit | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch) | |
| tree | c9b941f4798a2accca200b0b01c07353ce5b07e1 /scripts/config | |
| parent | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff) | |
| parent | e55a5999ffcf72dc4d43d73618957964cb87065a (diff) | |
| download | linux-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.tar.xz | |
Merge branch 'sfi-base' into release
Conflicts:
drivers/acpi/power.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'scripts/config')
0 files changed, 0 insertions, 0 deletions