aboutsummaryrefslogtreecommitdiff
path: root/include/linux/serio.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-15 14:51:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-15 14:51:39 -0800
commit9fc819172aa565c7be51f758b7e85301c9df7c70 (patch)
tree55bddc16c148257494ce912728422b32d5f96fbb /include/linux/serio.h
parent933a42b1842d0b7bc7e4e16f2f5f1099e72870d4 (diff)
parent44c36aed43b57ea12140957bebe76d711fbed653 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6: alpha: cpumask_of_node() should handle -1 as a node alpha: add myself as a maintainer, and drop mention of 2.4
Diffstat (limited to 'include/linux/serio.h')
0 files changed, 0 insertions, 0 deletions