OSDN Git Service

Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Tue, 3 Jun 2008 01:40:02 +0000 (21:40 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 3 Jun 2008 01:40:02 +0000 (21:40 -0400)
commit8aa53bfa691c21d8716efae1307bced6b705ce31
treef4f4a92664e01ebacb9908b5511b1e120eda0c78
parentdfb1d42a5601b5416823cb3ea4894390e26fb4af
parent9aa109c95dd0fc2cbcb0d309ab830d5898e1344b
Merge branch 'maint' into next
lib/blkid/probe.c