aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/dock.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@woody.linux-foundation.org> 2008-03-11 09:47:28 -0700
committerGravatar Linus Torvalds <torvalds@woody.linux-foundation.org> 2008-03-11 09:47:28 -0700
commitbaadac8b10c5ac15ce3d26b68fa266c8889b163f (patch)
tree8ab1c758f8b2fe21351102d9845c0f8ec81a52cf /drivers/acpi/dock.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/min... (diff)
parentx86: remove quicklists (diff)
downloadlinux-baadac8b10c5ac15ce3d26b68fa266c8889b163f.tar.gz
linux-baadac8b10c5ac15ce3d26b68fa266c8889b163f.tar.bz2
linux-baadac8b10c5ac15ce3d26b68fa266c8889b163f.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: remove quicklists x86: ia32 syscall restart fix x86: ioremap, remove WARN_ON()
Diffstat (limited to 'drivers/acpi/dock.c')
0 files changed, 0 insertions, 0 deletions