]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdeeaee1069eee90bc1c0a7d0761e2e5fa7b818e1
treeea565196d6db2ed80780639701fc0b74748bf90c
parent4bf8dfb6bacd63c1c34d50a9900c2f66045c6e55
parent968f3f609eadef5a7c7d6933b1fa22c3d03ff0ff
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