projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3d1c182 dda54e7)
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)
commitece928df16494becd43f999aff9bd530182e7e81
tree905042764ea5d8ab6eda63666406e19f607bcf4ctree | snapshot
parent3d1c1829ebe7e8bb48a997b39b4865abc9197e5ecommit | diff
parentdda54e76d7dba0532ebdd72e0b4f492a03f83225commit | diff
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 diff1 | diff2 | blob | history
John Crispins staging tree