diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 08:54:48 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 08:54:48 +0200 |
| commit | 35f6cd4a06432034665a1499ca4b022437423aac (patch) | |
| tree | ea565196d6db2ed80780639701fc0b74748bf90c /arch/x86/pci/acpi.c | |
| parent | SH: constify multiple DMA related objects and references to them (diff) | |
| parent | sh: Use correct mask when comparing PMB DATA array values (diff) | |
| download | linux-35f6cd4a06432034665a1499ca4b022437423aac.tar.xz linux-35f6cd4a06432034665a1499ca4b022437423aac.zip | |
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
Diffstat (limited to 'arch/x86/pci/acpi.c')
0 files changed, 0 insertions, 0 deletions