Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6
authorPaul Mundt <lethal@linux-sh.org>
Mon, 26 Apr 2010 06:54:48 +0000 (15:54 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 26 Apr 2010 06:54:48 +0000 (15:54 +0900)
commit35f6cd4a06432034665a1499ca4b022437423aac
treeea565196d6db2ed80780639701fc0b74748bf90c
parent5bac942db3d2c4738df04104240d65a5d1eaec6a
parent035ca59fe8399a67b56511bd5b28130f0c4874a0
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