]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b1caf6 f00c9e4)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 15:33:37 +0000 (07:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 15:33:37 +0000 (07:33 -0800)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Fix deadlock during path resolution

1  2 
fs/ext3/super.c patch | diff1 | diff2 | blob | history
fs/ext4/super.c patch | diff1 | diff2 | blob | history
fs/ocfs2/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/ext3/super.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/ocfs2/super.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.