Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorWim Van Sebroeck <wim@iguana.be>
Fri, 11 May 2007 19:03:13 +0000 (19:03 +0000)
committerWim Van Sebroeck <wim@iguana.be>
Fri, 11 May 2007 19:03:13 +0000 (19:03 +0000)

Trivial merge