From: David S. Miller <davem@davemloft.net>
Date: Fri, 20 May 2011 20:10:22 +0000 (-0700)
Subject: Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
X-Git-Tag: v3.0-rc1~357^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90d3ac15e5c637d45849e83c828ed78c62886737;p=pandora-kernel.git

Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'

Conflicts:
	arch/sparc/kernel/smp_32.c

With merge conflict help from Daniel Hellstrom.

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

90d3ac15e5c637d45849e83c828ed78c62886737
Reading git-diff-tree failed