Merge with ../linux-omap-dev
authorTony Lindgren <tony@atomide.com>
Thu, 11 Aug 2005 14:08:03 +0000 (07:08 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 11 Aug 2005 14:08:03 +0000 (07:08 -0700)

Trivial merge