projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bac942 035ca59)
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)
* '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


Trivial merge