Merge with /home/tmlind/src/kernel/linux-omap-2.6
authorTony Lindgren <tony@atomide.com>
Mon, 3 Oct 2005 08:07:17 +0000 (11:07 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 3 Oct 2005 08:07:17 +0000 (11:07 +0300)

Trivial merge