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)
commit83cf1eecfe9afee99d6b86f963187acd414c019d
tree4381bdcc45d81c8c3713630cae9660d770885d96
parentf1690d17d2c7afa2a2079e3c91eb2bca8c1c5ecd
parent0e341af835fdf553820a1fa98341b93ab32ce466
Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable
arch/arm/Kconfig