From: David S. Miller <davem@davemloft.net>
Date: Sun, 29 Mar 2009 22:44:22 +0000 (-0700)
Subject: Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.30-rc1~603^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed223129a30de7d244ca9b59819f5532c9caf039;p=pandora-kernel.git

Merge branch 'master' of ssh:///home/ftp/linux/kernel/git/rusty/linux-2.6-cpumask-for-sparc

Conflicts:
	arch/sparc/kernel/smp_64.c
---

ed223129a30de7d244ca9b59819f5532c9caf039
Reading git-diff-tree failed