Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jan 2010 22:51:39 +0000 (14:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jan 2010 22:51:39 +0000 (14:51 -0800)
* '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


Trivial merge