]> Git Repo - linux.git/commitdiff
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <[email protected]>
Thu, 13 May 2010 01:48:26 +0000 (18:48 -0700)
committerLinus Torvalds <[email protected]>
Thu, 13 May 2010 01:48:26 +0000 (18:48 -0700)
* '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


Trivial merge
This page took 0.045803 seconds and 4 git commands to generate.