commit: d2eee77e01938d323acecef76cd4e6a148bd7628 Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org> AuthorDate: Sun Jun 1 16:29:29 2014 +0000 Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org> CommitDate: Sun Jun 1 16:29:29 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d2eee77e
Merge remote-tracking branch 'gentoo/master' into upstream-master sci-biology/bedtools/ChangeLog | 6 ++++++ sci-biology/bedtools/Manifest | 2 +- .../bedtools/{bedtools-2.19.1.ebuild => bedtools-2.20.1.ebuild} | 0 sys-cluster/lustre/ChangeLog | 7 +++++++ ...0001-LU-3319-procfs-update-zfs-proc-handling-to-seq_files.patch | 2 +- ...0002-LU-3319-procfs-move-mdd-ofd-proc-handling-to-seq_fil.patch | 2 +- .../0003-LU-4416-mm-Backport-shrinker-changes-from-upstream.patch | 2 +- sys-cluster/lustre/lustre-9999.ebuild | 2 ++ 8 files changed, 19 insertions(+), 4 deletions(-)