aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/button.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-21 14:00:09 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-21 14:00:09 -0400
commit4e24db5b1a8fe0b0afab875ad2facdfaedce7b07 (patch)
treec5e4bfc2ad68885b1c4925d1a65fd8c7a50ad5aa /drivers/acpi/button.c
parentb30a3f6257ed2105259b404d419b4964e363928c (diff)
parent9b6efcd2e2275e13403700913b7a1da92cf11ad2 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: lguest: update comments to reflect LHCALL_LOAD_GDT_ENTRY. virtio: console: Prevent userspace from submitting NULL buffers virtio: console: Fix poll blocking even though there is data to read
Diffstat (limited to 'drivers/acpi/button.c')
0 files changed, 0 insertions, 0 deletions