Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Wed, 1 Nov 2006 21:04:25 +0000 (23:04 +0200)
committerTony Lindgren <tony@atomide.com>
Wed, 1 Nov 2006 21:04:25 +0000 (23:04 +0200)

Trivial merge