From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 2 Apr 2006 19:48:36 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
X-Git-Tag: v2.6.17-rc1~16
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=f900e5824a44ab65437b4f7e7c610b72f94820c5;p=safe%2Fjmp%2Flinux-2.6

Merge /pub/scm/linux/kernel/git/paulus/powerpc

* master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
  [PATCH] powerpc: iSeries needs slb_initialize to be called
  powerpc: hook up the splice syscall
  [PATCH] powerpc/cell: compile fixes
  [PATCH] powerpc: trivial spelling fixes in fault.c
  [PATCH] powerpc/pseries: EEH Cleanup
  [PATCH] powerpc/pseries: misc lparcfg fixes
  [PATCH] powerpc/pseries: fix device name printing, again.
  [PATCH] powerpc: Extends HCALL interface for InfiniBand usage
  [PATCH] powerpc/pseries: Change H_StudlyCaps to H_SHOUTING_CAPS
  [PATCH] powerpc/pseries: print message if EEH recovery fails
  [PATCH] powerpc/pseries: mutex lock to serialize EEH event processing
  powerpc: converted embedded platforms to use new define_machine support
  powerpc: merge machine_check_exception between ppc32 & ppc64
---

f900e5824a44ab65437b4f7e7c610b72f94820c5