commit cbd84ec0d5cf4ff760caa4b6de2925a21e21437d
author Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Dec 17 08:41:56 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Dec 17 08:41:56 2007 -0800
tree b05681fd753bef3c3beb5c6aa3e83b9701d5f837
parent 7b286af3921e13da4838cdb451639b959c187c82
parent 280bb6b1f76aaec29a721b1025ec5d69afba57e8

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] 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