Merge source.mvista.com:/home/git/linux-omap-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 5 Sep 2006 11:57:21 +0000 (14:57 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 5 Sep 2006 11:57:21 +0000 (14:57 +0300)

Trivial merge