]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a628b0 d67d1c7)
Merge branch 'devel' into next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 15 Jul 2008 22:34:16 +0000 (18:34 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 15 Jul 2008 22:34:16 +0000 (18:34 -0400)
commite89e896d31b11a51a54ddcd3f72a76bd286dd86c
tree105a9a93a4021caeeba76e479778ad2dd2b87b57tree | snapshot
parent3a628b0fd42f7eaf9d052447784d48ceae9ffb8ecommit | diff
parentd67d1c7bf948341fd8678c8e337ec27f4b46b206commit | diff
Merge branch 'devel' into next

Conflicts:

fs/nfs/file.c

Fix up the conflict with Jon Corbet's bkl-removal tree
fs/Kconfig diff1 | diff2 | blob | history
fs/nfs/file.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.