]> err.no Git - util-linux/commitdiff
Merge commit 'origin/master'
authorLaMont Jones <lamont@debian.org>
Thu, 6 Dec 2007 04:31:04 +0000 (21:31 -0700)
committerLaMont Jones <lamont@debian.org>
Thu, 6 Dec 2007 04:31:04 +0000 (21:31 -0700)
1  2 
mount/lomount.c
sys-utils/setarch.c

diff --cc mount/lomount.c
Simple merge
Simple merge