summaryrefslogtreecommitdiff
path: root/drivers/acpi/bus.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-26 03:28:56 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-26 03:28:56 +0400
commitb91ce4d14a21fc04d165be30319541e0f9204f15 (patch)
tree777a0e110de0d378c9425684369bef9cbab20649 /drivers/acpi/bus.c
parent202f2bb0708e968099a23fead4598a4c3f8f8637 (diff)
parent6443bb1fc2050ca2b6585a3fa77f7833b55329ed (diff)
downloadlinux-b91ce4d14a21fc04d165be30319541e0f9204f15.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: ipv6: Fix inet6_csk_bind_conflict() e100: Fix the TX workqueue race
Diffstat (limited to 'drivers/acpi/bus.c')
0 files changed, 0 insertions, 0 deletions