OSDN Git Service

Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Tue, 27 May 2014 17:08:52 +0000 (13:08 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 27 May 2014 17:08:52 +0000 (13:08 -0400)

Trivial merge