]> err.no Git - util-linux/commit
Merge commit 'origin'
authorLaMont Jones <lamont@mmjgroup.com>
Mon, 27 Aug 2007 15:35:12 +0000 (09:35 -0600)
committerLaMont Jones <lamont@mmjgroup.com>
Mon, 27 Aug 2007 15:35:12 +0000 (09:35 -0600)
commit26fc58ba626c891df211848faf2f09fba5cf82b7
tree9652f4f4ebb62f25e55d161b6047417112987d1a
parentadfc2925d2d89e9395f670a95ba3455253ceca8e
parentb557c30f6306229d9bff7bdacce90467e0a16b1f
Merge commit 'origin'

Conflicts:

schedutils/Makefile.am
sys-utils/setarch.c
configure.ac
mount/lomount.c
mount/mount.c