]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c3efe5 b03f245)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Apr 2011 14:35:17 +0000 (07:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Apr 2011 14:35:17 +0000 (07:35 -0700)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Don't write quota info in dquot_commit()
  ext3: Fix writepage credits computation for ordered mode

1  2 
fs/ext3/inode.c patch | diff1 | diff2 | blob | history
fs/quota/dquot.c patch | diff1 | diff2 | blob | history

diff --cc fs/ext3/inode.c
Simple merge
diff --cc fs/quota/dquot.c
Simple merge
XArray, radix tree and IDR