tree 7fa39362bfb1a4dbd3f4227f98b85c2e5d36d398
parent 73819b2d26aeb7719bb501c0136687b89d5ac3ef
parent d1f5a77f2c9db5b8a565eabdf8b534b02e32cc44
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1186873789 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1186873789 -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 size check for hugetlbfs
  [POWERPC] Fix initialization and usage of dma_mask
  [POWERPC] Fix more section mismatches in head_64.S
  [POWERPC] Revert "[POWERPC] Add 'mdio' to bus scan id list for platforms with QE UEC"
  [POWERPC] PS3: Update ps3_defconfig
  [POWERPC] PS3: Remove text saying PS3 support is incomplete
  [POWERPC] PS3: Fix storage probe logic
  [POWERPC] cell: Move SPU affinity init to spu_management_of_ops
  [POWERPC] Fix potential duplicate entry in SLB shadow buffer