aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2008-11-30 19:06:40 +0000
committerLinus Torvalds <[email protected]>2008-11-30 19:06:40 +0000
commit95c5e1f1e6e1788cc8b9acbe9379ae395ef64958 (patch)
treef6b41406a9eb3c6219d715efe00de7f43c232703 /net/unix/af_unix.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff)
parenttoshiba_acpi: close race in toshiba_acpi driver (diff)
downloadkernel-95c5e1f1e6e1788cc8b9acbe9379ae395ef64958.tar.gz
kernel-95c5e1f1e6e1788cc8b9acbe9379ae395ef64958.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: toshiba_acpi: close race in toshiba_acpi driver ACPICA: disable _BIF warning ACPI: delete OSI(Linux) DMI dmesg spam ACPICA: Allow _WAK method to return an Integer ACPI: thinkpad-acpi: fix fan sleep/resume path sony-laptop: printk tweak sony-laptop: brightness regression fix Revert "ACPI: don't enable control method power button as wakeup device when Fixed Power button is used" ACPI suspend: Blacklist boxes that require us to set SCI_EN directly on resume ACPI: scheduling in atomic via acpi_evaluate_integer () ACPI: battery: Convert discharge energy rate to current properly ACPI: EC: count interrupts only if called from interrupt handler.
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions