]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'xfs-misc-fixes-2-for-3.16' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 19 May 2014 22:56:00 +0000 (08:56 +1000)
committerDave Chinner <david@fromorbit.com>
Mon, 19 May 2014 22:56:00 +0000 (08:56 +1000)
commit0d907a3bb4a77cffebebd17c323e898048301aa3
treec093289c9ab443935ce10e138ab49efacb2c283f
parent2d6dcc6d7e95cc83046b2f97e179e6bbb7921245
parent376c2f3a5f0706868b08ccf043bf3532936a03b1
Merge branch 'xfs-misc-fixes-2-for-3.16' into for-next

Conflicts:
fs/xfs/xfs_ialloc.c
fs/xfs/xfs_da_btree.c
fs/xfs/xfs_ialloc.c
fs/xfs/xfs_log_cil.c