From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 May 2010 01:48:26 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v2.6.34~25
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=be835674b55324c1abe973b15343c3663910c620;p=linux-2.6-block.git

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/perf_event: Fix oops due to perf_event_do_pending call
  powerpc/swiotlb: Fix off by one in determining boundary of which ops to use
---

be835674b55324c1abe973b15343c3663910c620