projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5ec390e 131c6c9)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 May 2010 01:48:26 +0000 (18:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 May 2010 01:48:26 +0000 (18:48 -0700)
commitbe835674b55324c1abe973b15343c3663910c620
tree481604c6b68bc5c37e9674e72ea3f967ee609b1btree | snapshot
parent5ec390e046039942d59ef2634b967b8b23fc57c2commit | diff
parent131c6c9eddfa252e376edb4aeff9c7fe1b96a798commit | diff
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
Domain: System / Kernel;