Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Tue, 2 Jan 2007 19:17:05 +0000 (11:17 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 2 Jan 2007 19:17:05 +0000 (11:17 -0800)

Trivial merge