]> err.no Git - linux-2.6/commitdiff
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 18 Oct 2005 21:25:28 +0000 (14:25 -0700)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 18 Oct 2005 21:25:28 +0000 (14:25 -0700)

Trivial merge