Merge branch 'irq-davinci' of git://gitorious.org/linux-davinci/linux-davinci into...
Russell King [Wed, 11 May 2011 17:49:31 +0000 (18:49 +0100)]

Trivial merge