Makefile.am | 1 1 + 0 - 0 !
configure.ac | 4 2 + 2 - 0 !
libblkid/blkid.pc.in | 1 1 + 0 - 0 !
libmount/mount.pc.in | 1 1 + 0 - 0 !
libuuid/uuid.pc.in | 1 1 + 0 - 0 !
5 files changed, 6 insertions(+), 2 deletions(-)

 multiarch support in util-linux build

Addresses-Debian-Bug: 631175
Signed-off-by: LaMont Jones <lamont@debian.org>

Conflicts:
	debian/control
	debian/libblkid-dev.files
	debian/libblkid1.files
	debian/libmount-dev.files
	debian/libmount1.files
	debian/libuuid1.files
	debian/rules
	debian/uuid-dev.files

sys-utils/hwclock.8 | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 man page tweaks, cleanup my_dev_t.h ancient stuff

Conflicts:
	getopt/getopt.1
	mount/my_dev_t.h

sys-utils/hwclock.c | 10 10 + 0 - 0 !
1 file changed, 10 insertions(+)

 disable the fallback clause in hwclock when /dev/rtc cannot be
 opened.

hwclock should not access the x86 RTC using I/O instructions unless explicitly
requested from the command line (--directisa). This issue was encountered
while debugging a boot time race when hwclock.sh was run in parallel.

Addresses-Ubuntu-Bug: 274402
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: LaMont Jones <lamont@debian.org>

Conflicts:
	hwclock/hwclock.c

tests/Makemodule.am | 2 1 + 1 - 0 !
tests/functions.sh | 11 11 + 0 - 0 !
2 files changed, 12 insertions(+), 1 deletion(-)

 verbose-tests

Enable verbose tests and print content of failing tests output file.

bash-completion/umount | 9 5 + 4 - 0 !
1 file changed, 5 insertions(+), 4 deletions(-)

 bash-completion: (umount) use findmnt, escape a space in paths