summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/poll.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-18 08:31:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-18 08:31:14 -0800
commit83c5aac175e182c30729650f2edee3294c3b8bb0 (patch)
tree33a3ad885a9c74da05b25a97d9cc6b448b07861f /arch/x86/include/asm/poll.h
parent2fa298cf6d6bedf64f75644e9e8b0d64d2d83f27 (diff)
parent3b77fd8ee6a8ae34e349651e9d5f5000d1cc206e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: add KEY_RFKILL Input: i8042 - fix KBC jam during hibernate
Diffstat (limited to 'arch/x86/include/asm/poll.h')
0 files changed, 0 insertions, 0 deletions