]> err.no Git - util-linux/commit
Merge remote branch 'origin/master' into HEAD
authorLaMont Jones <lamont@debian.org>
Fri, 14 May 2010 11:07:14 +0000 (05:07 -0600)
committerLaMont Jones <lamont@debian.org>
Fri, 14 May 2010 11:07:14 +0000 (05:07 -0600)
commit3cbdfd84fde6159d7778e70618fbbc8df219cafe
treee545f7d9e6b73426f590f3195f1d458f5c52d518
parent321ab951929f2ed871751ba8979d1136d036485a
parentab978962b15489b62f41a2ec0de4c44c9e25df6e
Merge remote branch 'origin/master' into HEAD

Conflicts:
lib/fsprobe.c
mount/lomount.c
hwclock/hwclock.8
hwclock/hwclock.c
mount/Makefile.am
mount/lomount.c
mount/losetup.8
mount/mount.8
mount/mount.c