From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jun 2010 22:46:37 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v2.6.35-rc2~45
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=39059cceeda478cd040d521b9541d1113035c908;p=net-next-2.6.git

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/macio: Fix probing of macio devices by using the right of match table
  agp/uninorth: Fix oops caused by flushing too much
  powerpc/pasemi: Update MAINTAINERS file
  powerpc/cell: Fix integer constant warning
  powerpc/kprobes: Remove resume_execution() in kprobes
  powerpc/macio: Don't dereference pointer before null check
---

39059cceeda478cd040d521b9541d1113035c908