From: Alex Elder <aelder@sgi.com>
Date: Mon, 17 Oct 2011 20:42:02 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
X-Git-Tag: v3.2-rc1~134^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9508534c5f170ada5a745cde0df49732718440e9;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux

Resolved conflicts:
  fs/xfs/xfs_trans_priv.h:
    - deleted struct xfs_ail field xa_flags
    - kept field xa_log_flush in struct xfs_ail
  fs/xfs/xfs_trans_ail.c:
    - in xfsaild_push(), in XFS_ITEM_PUSHBUF case, replaced
      "flush_log = 1" with "ailp->xa_log_flush++"

Signed-off-by: Alex Elder <aelder@sgi.com>
---

9508534c5f170ada5a745cde0df49732718440e9
Reading git-diff-tree failed