From: Linus Torvalds 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: v2.6.23-rc3~9 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=75ecb1a4d148b274aa9acd1d6ccaca0a4654784e;p=linux-2.6-omap-h63xx.git 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 --- 75ecb1a4d148b274aa9acd1d6ccaca0a4654784e