Merge commit 'v2.6.36' into oprofile/core
Robert Richter [Thu, 21 Oct 2010 09:39:26 +0000 (11:39 +0200)]
1  2 
Makefile
arch/arm/Kconfig
kernel/perf_event.c
kernel/trace/ring_buffer.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge