Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 26 Nov 2010 10:28:11 +0000 (10:28 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 26 Nov 2010 10:28:11 +0000 (10:28 +0000)
1  2 
arch/arm/Kconfig

Simple merge