diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-04 12:12:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-04 12:12:19 -0700 |
| commit | a8941b0ed0f1e39a4d41560c3a2e7ee37d5b6e10 (patch) | |
| tree | cf1a15d5dfc7e1552c12b4a3ec04fa9ee92581ef /kernel/Makefile | |
| parent | d82ef020cf31504c816803b1def94eb5ff173363 (diff) | |
| parent | 292f60c0c4ab44aa2d589ba03c12e64a3b3c5e38 (diff) | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ring-buffer: Add missing unlock
tracing: Fix lockdep warning in global_clock()
Diffstat (limited to 'kernel/Makefile')
0 files changed, 0 insertions, 0 deletions