| commit | 35f6cd4a06432034665a1499ca4b022437423aac | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Mon Apr 26 15:54:48 2010 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Mon Apr 26 15:54:48 2010 +0900 |
| tree | ea565196d6db2ed80780639701fc0b74748bf90c | |
| parent | 5bac942db3d2c4738df04104240d65a5d1eaec6a [diff] | |
| parent | 035ca59fe8399a67b56511bd5b28130f0c4874a0 [diff] |
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