]> err.no Git - util-linux/commit
projects / util-linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e007010 c7e210b)
Merge branch 'stable/v2.14'
authorLaMont Jones <lamont@debian.org>
Tue, 17 Feb 2009 12:48:10 +0000 (05:48 -0700)
committerLaMont Jones <lamont@debian.org>
Tue, 17 Feb 2009 12:48:10 +0000 (05:48 -0700)
commite218b8a8c0f7a9f9eb3591a91d2e2120da4171c8
tree81ec38f0bc216923156702ff91fa8dff7e2b7ea0tree | snapshot
parente007010d0fad58e2615aa7bc04bcaa916b365913commit | diff
parentc7e210b0270856525e5bda611b09521f3a30a20acommit | diff
Merge branch 'stable/v2.14'

Conflicts:

fdisk/fdisk.c
fdisk/partname.c
include/blkdev.h
mount/fstab.c
mount/lomount.c
mount/mount.8
mount/umount.c
schedutils/chrt.c
schedutils/ionice.1
sys-utils/Makefile.am
sys-utils/ipcs.c
sys-utils/rtcwake.c
configure.ac diff1 | diff2 | blob | history
mount/Makefile.am diff1 | diff2 | blob | history
mount/lomount.c diff1 | diff2 | blob | history
mount/mount.8 diff1 | diff2 | blob | history
mount/mount.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.