From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 25 Jul 2012 00:05:27 +0000 (+1000)
Subject: Merge remote-tracking branch 'xfs/for-next'
X-Git-Tag: next-20120725~79
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8bafa13c87d5e4d816fa1791ba2d2b679a82309e;p=karo-tx-linux.git

Merge remote-tracking branch 'xfs/for-next'

Conflicts:
	fs/xfs/xfs_buf.c
	fs/xfs/xfs_log.c
	fs/xfs/xfs_log_priv.h
---

8bafa13c87d5e4d816fa1791ba2d2b679a82309e