summaryrefslogtreecommitdiffstats
path: root/ipc/shm.c
diff options
context:
space:
mode:
authorLinus Torvalds2009-09-27 19:38:48 +0200
committerLinus Torvalds2009-09-27 19:38:48 +0200
commit73964f6bc8e378715887592abe8a512f403db6a8 (patch)
treec4aaab48d36ed06243542518ff644c654bdaf586 /ipc/shm.c
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentACPI: IA64=y ACPI=n build fix (diff)
downloadkernel-qcow2-linux-73964f6bc8e378715887592abe8a512f403db6a8.tar.gz
kernel-qcow2-linux-73964f6bc8e378715887592abe8a512f403db6a8.tar.xz
kernel-qcow2-linux-73964f6bc8e378715887592abe8a512f403db6a8.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: IA64=y ACPI=n build fix ACPI: Kill overly verbose "power state" log messages ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression ACPI: Clarify resource conflict message thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem
Diffstat (limited to 'ipc/shm.c')
0 files changed, 0 insertions, 0 deletions