tree 213e124c89a51bbb99dd8e07fb6eacc970bbdc99
parent 1883c5aba9973331e3ff0050e05707fe8e84fe0d
parent eeac5c142b8687e35780b11b54b4c2f95b1a2436
author Linus Torvalds <torvalds@g5.osdl.org> 1158159701 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1158159701 -0700

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