Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream
authorRussell King <[email protected]>
Wed, 18 Jan 2006 22:56:29 +0000 (22:56 +0000)
committerRussell King <[email protected]>
Wed, 18 Jan 2006 22:56:29 +0000 (22:56 +0000)

Trivial merge