]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Dec 2010 23:54:24 +0000 (15:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Dec 2010 23:54:24 +0000 (15:54 -0800)
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ring_buffer: Off-by-one and duplicate events in ring_buffer_read_page


Trivial merge