From: David S. Miller <davem@davemloft.net>
Date: Fri, 27 Apr 2012 03:00:35 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
X-Git-Tag: v3.5-rc1~190^2~104
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fe5f56c8a203a7a83d1b621c369655d914f3752;p=pandora-kernel.git

Merge git://git./linux/kernel/git/torvalds/linux

Conflicts:
	arch/sparc/kernel/leon_smp.c

Merge mainline to get the nobootmem.c bug fix, for the sake
of the sparc64 NO_BOOTMEM conversion.

Resolve a small include line conflict in leon_smp.c

Signed-off-by: David S. Miller <davem@davemloft.net>
---

8fe5f56c8a203a7a83d1b621c369655d914f3752
Reading git-diff-tree failed