From: Linus Torvalds Date: Fri, 30 Mar 2012 17:56:11 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=307cc7904841fd66a848ece16a179b49ae1a4ba4;p=linux-beck.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc Pull minor Sparc fixes from David Miller: "This just fixes build fallout due to recent changes that went int your tree." Sam Ravnborg says that sparc32 still needs some more tender loving. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc: Fix even more fallout from system.h split. sparc: fix fallout from system.h split --- 307cc7904841fd66a848ece16a179b49ae1a4ba4