Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Sat, 5 Jan 2013 15:15:04 +0000 (10:15 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Sat, 5 Jan 2013 15:15:04 +0000 (10:15 -0500)
commit827f45243acc16d3d98332db39d5b4eeadf33a0f
tree6e6183bfcdf2bdfe7909a4285b2eafaeca650e35
parentb9b5e43ea81ecf575e3d96cbf51215aba3746b32
parent027b0577d4e5081a4d28dff9289559d38a36d533
Merge branch 'maint' into next

Conflicts:
resize/resize2fs.c
e2fsck/super.c
lib/ext2fs/alloc.c
lib/ext2fs/extent.c
resize/resize2fs.c