Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Thu, 30 Nov 2006 21:45:17 +0000 (13:45 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 30 Nov 2006 21:45:17 +0000 (13:45 -0800)

Trivial merge