projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 404cbbd 66832eb)
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <[email protected]>
Tue, 18 Jan 2011 22:29:37 +0000 (14:29 -0800)
committerLinus Torvalds <[email protected]>
Tue, 18 Jan 2011 22:29:37 +0000 (14:29 -0800)
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Validate cpu early in perf_event_alloc()
  perf: Find_get_context: fix the per-cpu-counter check
  perf: Fix contexted inheritance

1  2 
kernel/perf_event.c patch | diff1 | diff2 | blob | history

diff --cc kernel/perf_event.c
Simple merge
John Crispins staging tree