From: Linus Torvalds Date: Fri, 15 Jan 2010 22:51:39 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88... X-Git-Tag: v3.12-rc1~11567 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9fc819172aa565c7be51f758b7e85301c9df7c70;p=kernel%2Fkernel-generic.git Merge branch 'for-linus' of git://git./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 --- 9fc819172aa565c7be51f758b7e85301c9df7c70