summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 18:34:07 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 18:34:07 +0200
commit746942d06acdb4dd78d16baa5f3728a48a033bdd (patch)
tree1470ffab015f6b7c2ff6f44314f9fab17d3a4c3f /drivers/acpi/sleep.c
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff)
parentMerge branch 'linus' into sfi-release (diff)
downloadlinux-746942d06acdb4dd78d16baa5f3728a48a033bdd.tar.xz
linux-746942d06acdb4dd78d16baa5f3728a48a033bdd.zip
Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6
* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6: SFI: remove unneeded includes sfi: Remove unused code SFI: Hook PCI MMCONFIG x86: add arch-specific SFI support SFI: add capability to parse ACPI tables SFI: add platform-independent core support SFI: create linux/sfi.h SFI: Simple Firmware Interface - MAINTAINERS, Kconfig
Diffstat (limited to 'drivers/acpi/sleep.c')
0 files changed, 0 insertions, 0 deletions