aboutsummaryrefslogtreecommitdiffstats
path: root/mm/huge_memory.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-15 15:19:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-15 15:19:45 -0800
commit09f586b35d8503b57de1e0e9b19bc6b38e0d7319 (patch)
treef66610ae231f67d5c1239aa3ef73f2941b513f56 /mm/huge_memory.c
parentMerge branch 'tools-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 (diff)
parentMerge branch 'iomem' into release (diff)
downloadlinux-dev-09f586b35d8503b57de1e0e9b19bc6b38e0d7319.tar.xz
linux-dev-09f586b35d8503b57de1e0e9b19bc6b38e0d7319.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI / Video: Probe for output switch method when searching video devices. ACPI / Wakeup: Enable button GPEs unconditionally during initialization ACPI / ACPICA: Avoid crashing if _PRW is defined for the root object ACPI: Fix acpi_os_read_memory() and acpi_os_write_memory() (v2)
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions