From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 26 Apr 2010 06:54:48 +0000 (+0900)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=35f6cd4a06432034665a1499ca4b022437423aac;p=deliverable%2Flinux.git

Merge branch 'master' of /linux/kernel/git/mfleming/sh-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6:
  sh: Use correct mask when comparing PMB DATA array values
  sh: Do not try merging two 128MB PMB mappings
  sh: Fix zImage load address when CONFIG_32BIT=y
  sh: Fix address to decompress at when CONFIG_32BIT=y
  sh: Assembly friendly __pa and __va definitions
---

35f6cd4a06432034665a1499ca4b022437423aac