From: David S. Miller <davem@davemloft.net>
Date: Wed, 6 Aug 2014 01:57:18 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~148^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9011d086674caeedb0ffb6eb5b8bc5920821df3;p=pandora-kernel.git

Merge git://git./linux/kernel/git/davem/sparc

Conflicts:
	arch/sparc/mm/init_64.c

Conflict was simple non-overlapping additions.

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

e9011d086674caeedb0ffb6eb5b8bc5920821df3
Reading git-diff-tree failed