From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 17 Dec 2007 16:41:56 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v3.12-rc1~24404
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbd84ec0d5cf4ff760caa4b6de2925a21e21437d;p=kernel%2Fkernel-generic.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] Make PS3_SYS_MANAGER default y, not m
  [POWERPC] Fix rounding bug in emulation for double float operating
  [POWERPC] iSeries: don't printk with HV spinlock held
  [POWERPC] 82xx: mpc8272ads, pq2fads: Update defconfig with CONFIG_FS_ENET_MDIO_FCC
  [POWRPC] CPM2: Eliminate section mismatch warning in cpm2_reset().
  [POWERPC] Kill non-existent symbols from ksyms and commproc.h
  [POWERPC] Fix typo #ifdef -> #ifndef
---

cbd84ec0d5cf4ff760caa4b6de2925a21e21437d