Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Wed, 20 Sep 2006 16:33:10 +0000 (19:33 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 20 Sep 2006 16:33:10 +0000 (19:33 +0300)

Trivial merge