From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 May 2011 01:25:37 +0000 (+1000)
Subject: Merge remote-tracking branch 'sparc-current/master'
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41ef41ca8960691723787801f145accd1880b644;p=pandora-kernel.git

Merge remote-tracking branch 'sparc-current/master'

Conflicts:
	arch/sparc/include/asm/smp_32.h
	arch/sparc/kernel/smp_32.c
---

41ef41ca8960691723787801f145accd1880b644
Reading git-diff-tree failed