]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e0641a 01c3b86)
Merge branch 'locks'
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 5 Jul 2006 17:19:25 +0000 (13:19 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 5 Jul 2006 17:19:25 +0000 (13:19 -0400)

Trivial merge
Linux 2.6 source tree