Merge source.mvista.com:/home/git/linux-omap-2.6
authorTony Lindgren <tony@atomide.com>
Thu, 15 Jun 2006 01:24:25 +0000 (18:24 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Jun 2006 01:24:25 +0000 (18:24 -0700)

Trivial merge