tree ea565196d6db2ed80780639701fc0b74748bf90c
parent 5bac942db3d2c4738df04104240d65a5d1eaec6a
parent 035ca59fe8399a67b56511bd5b28130f0c4874a0
author Paul Mundt <lethal@linux-sh.org> 1272264888 +0900
committer Paul Mundt <lethal@linux-sh.org> 1272264888 +0900

Merge branch 'master' of master.kernel.org:/pub/scm/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