Merge with /home/tmlind/src/kernel/linux-omap-2.6
authorTony Lindgren <tony@atomide.com>
Wed, 9 Nov 2005 20:55:39 +0000 (12:55 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 9 Nov 2005 20:55:39 +0000 (12:55 -0800)

Trivial merge