tree e5bfd784a7d34a5c04005fa4169986921f9fdcd1
parent f4b9a988685da6386d7f9a72df3098bcc3270526
parent 4177662ec9f5e50b69ef074369fdb429dd48d97e
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1249910609 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1249910609 +0100

Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6