Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorWim Van Sebroeck <wim@iguana.be>
Tue, 1 May 2007 06:53:01 +0000 (06:53 +0000)
committerWim Van Sebroeck <wim@iguana.be>
Tue, 1 May 2007 06:53:01 +0000 (06:53 +0000)

Trivial merge