diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 19:17:52 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 19:17:52 +0200 |
commit | 9faa1e5942fd647b0dd2fbbdcc04988841cacaf3 (patch) | |
tree | 3a2e467b04b7e66c9ef233e8c8b286278ef79adf /arch/powerpc/include/asm/mpc5121.h | |
parent | Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | x86: Ioremap: fix wrong physical address handling in PAT code (diff) | |
download | linux-9faa1e5942fd647b0dd2fbbdcc04988841cacaf3.tar.xz linux-9faa1e5942fd647b0dd2fbbdcc04988841cacaf3.zip |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Ioremap: fix wrong physical address handling in PAT code
x86, tlb: Clean up and correct used type
x86, iomap: Fix wrong page aligned size calculation in ioremapping code
x86, mm: Create symbolic index into address_markers array
x86, ioremap: Fix normal ram range check
x86, ioremap: Fix incorrect physical address handling in PAE mode
x86-64, mm: Initialize VDSO earlier on 64 bits
x86, kmmio/mmiotrace: Fix double free of kmmio_fault_pages
Diffstat (limited to 'arch/powerpc/include/asm/mpc5121.h')
0 files changed, 0 insertions, 0 deletions