Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 11 Oct 2005 16:21:34 +0000 (19:21 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 11 Oct 2005 16:21:34 +0000 (19:21 +0300)

Trivial merge