diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 10:27:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 10:27:18 -0700 |
| commit | 627312b9a877983f2164a67d042541ec1ffc435b (patch) | |
| tree | a8109ce649b4ef26998254088a54b01acd3df73f /include/linux/perf_event.h | |
| parent | 94095a1fff89dffe9451839deae4c6a40cf3ec21 (diff) | |
| parent | 4fe84fb8c6b5081f7364af63aee8e118a665b966 (diff) | |
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core locking changes from Ingo Molnar:
"It includes a lockdep improvement plus a spinlock inlining Kconfig
cleanup."
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking: Adjust spin lock inlining Kconfig options
lockdep: Check if nested lock is actually held
Diffstat (limited to 'include/linux/perf_event.h')
0 files changed, 0 insertions, 0 deletions