]> err.no Git - util-linux/commitdiff
projects / util-linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07f0f4d fda9d11)
Merge commit 'origin/stable/v2.13' into stable/v2.13
authorLaMont Jones <lamont@debian.org>
Thu, 6 Dec 2007 04:30:43 +0000 (21:30 -0700)
committerLaMont Jones <lamont@debian.org>
Thu, 6 Dec 2007 04:30:43 +0000 (21:30 -0700)
Conflicts:

getopt/getopt.1

1  2 
mount/lomount.c patch | diff1 | diff2 | blob | history

diff --cc mount/lomount.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.