]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2...
authorJoel Becker <jlbec@evilplan.org>
Thu, 26 May 2011 04:51:55 +0000 (21:51 -0700)
committerJoel Becker <jlbec@evilplan.org>
Thu, 26 May 2011 04:51:55 +0000 (21:51 -0700)
commitd9583546810c3f4ece5e622f5501b3662abe857f
tree905042764ea5d8ab6eda63666406e19f607bcf4c
parent8f214e3ddcd1d606c5fdb9503c396128f539d20b
parent692b2e6a6a153b7ab193e0e411c6fa3774d88720
Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window

Conflicts:
fs/ocfs2/ioctl.c
fs/ocfs2/ioctl.c