Merge source.mvista.com:/home/git/linux-omap-2.6
authorTony Lindgren <tony@atomide.com>
Mon, 7 Aug 2006 15:11:39 +0000 (18:11 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 7 Aug 2006 15:11:39 +0000 (18:11 +0300)

Trivial merge