git.baikalelectronics.ru Git - kernel.git/commit

author	Dave Chinner <david@fromorbit.com>
	Wed, 14 May 2014 23:39:28 +0000 (09:39 +1000)
committer	Dave Chinner <david@fromorbit.com>
	Wed, 14 May 2014 23:39:28 +0000 (09:39 +1000)
commit	70d0d83c46442f378dc9787c89b93296d241295a
tree	d2fd8f88141001a92c8aeb66706f2b502542ade6	tree \| snapshot
parent	1b0b8ec363b7eef2f5a95f818efef999e28d8fab	commit \| diff
parent	5ee93cad709bb92401eeaf38abd9521f44ce9fbf	commit \| diff

Merge branch 'xfs-attr-cleanup' into for-next

Conflicts:
fs/xfs/xfs_attr.c