From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 11 Aug 2007 23:09:49 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: MMI-PSA29.97-13-9~40783
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=75ecb1a4d148b274aa9acd1d6ccaca0a4654784e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'merge' of git://git./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
---

75ecb1a4d148b274aa9acd1d6ccaca0a4654784e