summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-12 02:23:16 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-12 02:23:16 +0200
commit577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d (patch)
tree8b3d6902494dcf3d872ce7e47ebe38846f0d8895 /net
parentfix SERIAL_CORE_CONSOLE driver dependencies (diff)
parentocfs2: Fix calculation of i_blocks during truncate (diff)
downloadlinux-577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d.tar.xz
linux-577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2: Fix calculation of i_blocks during truncate [PATCH] ocfs2: Fix a wrong cluster calculation. [PATCH] ocfs2: fix mount option parsing ocfs2: update docs for new features
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions