git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

projects / ceph-client.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b01c3a0 e22057c)

author	Ingo Molnar <mingo@kernel.org>
	Mon, 26 Mar 2012 15:18:44 +0000 (17:18 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Mon, 26 Mar 2012 15:19:03 +0000 (17:19 +0200)
commit	7fd52392c56361a40f0c630a82b36b95ca31eac6
tree	14091de24c6b28ea4cae9826f98aeedb7be091f5	tree \| snapshot
parent	b01c3a0010aabadf745f3e7fdb9cab682e0a28a2	commit \| diff
parent	e22057c8599373e5caef0bc42bdb95d2a361ab0d	commit \| diff

Merge branch 'linus' into perf/urgent

Merge reason: we need to fix a non-trivial merge conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/cpu/perf_event.c	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.