Merge with /home/tmlind/src/kernel/linux-2.6
authorTony Lindgren <tony@atomide.com>
Mon, 7 Aug 2006 08:13:47 +0000 (11:13 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 7 Aug 2006 08:13:47 +0000 (11:13 +0300)

Trivial merge