Merge commit 'v2.6.36' into oprofile/core
authorRobert Richter <robert.richter@amd.com>
Thu, 21 Oct 2010 09:39:26 +0000 (11:39 +0200)
committerRobert Richter <robert.richter@amd.com>
Thu, 21 Oct 2010 09:39:26 +0000 (11:39 +0200)
commit328b8f1ba50b708a1b3c0acd7c41ee1b356822f6
tree819e5cf05bcb160faee1eb546e3471284c9bbaae
parent57fa7214330be2e292ddb1402834ff0b221ef29a
parentf6f94e2ab1b33f0082ac22d71f66385a60d8157f
Merge commit 'v2.6.36' into oprofile/core
Makefile
arch/arm/Kconfig
kernel/perf_event.c
kernel/trace/ring_buffer.c