tree 4381bdcc45d81c8c3713630cae9660d770885d96
parent f1690d17d2c7afa2a2079e3c91eb2bca8c1c5ecd
parent 0e341af835fdf553820a1fa98341b93ab32ce466
author Russell King <rmk+kernel@arm.linux.org.uk> 1290767291 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1290767291 +0000

Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable