]> 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)
commit759fa3e26ea7c7b58d73e28a57a854754521e649
tree905042764ea5d8ab6eda63666406e19f607bcf4c
parent0c8b5a2936cf85fe4cbe5d562e2506c25f7b19de
parent53f7dd540ba2428c22edd01eecfa93c2c85eb505
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