Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Mon, 4 Sep 2006 14:52:59 +0000 (17:52 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 4 Sep 2006 14:52:59 +0000 (17:52 +0300)

Trivial merge