| commit | be835674b55324c1abe973b15343c3663910c620 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 12 18:48:26 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 12 18:48:26 2010 -0700 |
| tree | 481604c6b68bc5c37e9674e72ea3f967ee609b1b | |
| parent | 5ec390e046039942d59ef2634b967b8b23fc57c2 [diff] | |
| parent | 131c6c9eddfa252e376edb4aeff9c7fe1b96a798 [diff] |
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/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