The following commit has been merged in the master branch: commit 305a79477d505247c803a4c3479a6703f129ab83 Merge: 117f60a09441102f2c4c3ca0401603a868eb348b d6a66f871707aa5f5c48bcd1c1bc6688932e541c Author: Patrick Winnertz <win...@debian.org> Date: Tue Jun 2 11:19:57 2009 +0200
Merge commit 'upstream/1.8.0' Conflicts: ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.18-vanilla.patch -- Lustre Debian Packaging _______________________________________________ Pkg-lustre-svn-commit mailing list Pkg-lustre-svn-commit@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit