Merge source.mvista.com:/home/git/linux-omap-2.6
authorTony Lindgren <tony@atomide.com>
Wed, 21 Jun 2006 22:27:09 +0000 (15:27 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 21 Jun 2006 22:27:09 +0000 (15:27 -0700)

Trivial merge