summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-13 08:01:41 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-13 08:01:41 -0700
commit63b98080daa35f0d682db04f4fb7ada010888752 (patch)
tree213e124c89a51bbb99dd8e07fb6eacc970bbdc99 /kernel
parent1883c5aba9973331e3ff0050e05707fe8e84fe0d (diff)
parenteeac5c142b8687e35780b11b54b4c2f95b1a2436 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption [POWERPC] Fix MMIO ops to provide expected barrier behaviour [POWERPC] Fix interrupt clearing in kdump shutdown sequence [POWERPC] update prep_defconfig [POWERPC] kdump: Support kernels having 64k page size. [POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic(). [POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx. [POWERPC] Update defconfigs
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions