Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
Russell King [Sat, 16 May 2009 18:51:20 +0000 (19:51 +0100)]

Trivial merge