]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 763008c 737480a)
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Aug 2010 16:06:49 +0000 (09:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Aug 2010 16:06:49 +0000 (09:06 -0700)
commitb3ea36b7a242773d7a05cec6c071a47b6581c178
tree53edfe621b34f30b6f5212f4479d21e2c68dc743tree | snapshot (tar.bz2 tar.gz zip)
parent763008c4357b73c8d18396dfd8d79dc58fa3f99dcommit | diff
parent737480a0d525dae13306296da08029dff545bc72commit | diff
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  kprobes/x86: Fix the return address of multiple kretprobes
  perf tools: Fix build error on read only source.
  perf, x86: Fix Intel-nhm PMU programming errata workaround
Clone of davem's net-next-2.6 tree