summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 12:52:16 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 12:52:16 -0700
commit3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e (patch)
tree10587a53ab093fc498fa52651f8a7c1b2b99af60 /usr
parent6bbd9b6d694ff7242d63cda2faac4bd59ee4328e (diff)
parenteb35746ca5e2211569b91ebb44d55b88ec91f3b0 (diff)
downloadlinux-3.10-3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e.tar.gz
linux-3.10-3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e.tar.bz2
linux-3.10-3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e.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: Remove overzealous BUG_ON() ocfs2: Don't print on unknown remote blocking call ocfs2: Remove EXPERIMENTAL dependency ocfs2: implement directory read-ahead ocfs2: properly update i_mtime on buffered write ocfs2: Fix directory link count checks in ocfs2_link() ocfs2: move nlink check in ocfs2_mknod() ocfs2: Fix heartbeat sector calculation [PATCH] fs/ocfs2/ioctl.c should #include "ioctl.h" ocfs2: add ext2 attributes configfs: Prevent duplicate subsystem names.
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions