Merge branch 'omap/4460' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Sun, 17 Jul 2011 19:44:10 +0000 (21:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sun, 17 Jul 2011 19:44:10 +0000 (21:44 +0200)

Trivial merge