diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 16:07:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 16:07:52 -0700 |
| commit | 3e42dee676e8cf5adca817b1518b2e99d1c138ff (patch) | |
| tree | 23580fe97d1e452667b507c2aadb99877d0b574c /kernel/trace/ftrace.c | |
| parent | 42daabf62bfa3c00974b43f030dadcf704c0db59 (diff) | |
| parent | 88c8004fd3a5fdd2378069de86b90b21110d33a4 (diff) | |
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking changes from Ingo Molnar:
"Four miscellanous standalone fixes for futexes, rtmutexes and
Kconfig.locks."
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
futex: Use freezable blocking call
futex: Take hugepages into account when generating futex_key
rtmutex: Document rt_mutex_adjust_prio_chain()
locking: Fix copy/paste errors of "ARCH_INLINE_*_UNLOCK_BH"
Diffstat (limited to 'kernel/trace/ftrace.c')
0 files changed, 0 insertions, 0 deletions