Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Sun, 9 Dec 2007 22:03:01 +0000 (17:03 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 9 Dec 2007 22:03:01 +0000 (17:03 -0500)
commite6a4571eec5ce0e75fb8a5a41c30bf0e68d90efe
tree16f64c94b292930967e39f563467aaab0de92c92
parent5ea565fd37821b2708c2b7f1e49fe6fc94587794
parent80dda9bb7510059f430e2baba842875a7f3b448c
Merge branch 'maint' into next

Conflicts:

lib/ext2fs/closefs.c
lib/blkid/devname.c
lib/ext2fs/bmap.c
lib/ext2fs/closefs.c
lib/ext2fs/ext2fs.h
lib/ext2fs/initialize.c
lib/ext2fs/inode.c
lib/ext2fs/ismounted.c
lib/ext2fs/openfs.c
misc/e2image.c