]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bf2aa1 dfd8317)
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Sun, 25 Jun 2006 10:44:44 +0000 (06:44 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sun, 25 Jun 2006 10:44:44 +0000 (06:44 -0400)

Trivial merge
Linux 2.6 source tree