git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a93a06 a84a79e)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorAlex Elder <aelder@sgi.com>
Mon, 17 Oct 2011 20:42:02 +0000 (15:42 -0500)
committerAlex Elder <aelder@sgi.com>
Mon, 17 Oct 2011 20:42:02 +0000 (15:42 -0500)
commit9508534c5f170ada5a745cde0df49732718440e9
tree2b0f1e19aa529e77720522d13541adedbc46564etree | snapshot
parent5a93a064d27b42e4af1772b0599b53e3241191accommit | diff
parenta84a79e4d369a73c0130b5858199e949432da4c6commit | diff
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>
fs/xfs/xfs_buf_item.c diff1 | diff2 | blob | history
fs/xfs/xfs_inode_item.c diff1 | diff2 | blob | history
fs/xfs/xfs_super.c diff1 | diff2 | blob | history
fs/xfs/xfs_trans.h diff1 | diff2 | blob | history
fs/xfs/xfs_trans_ail.c diff1 | diff2 | blob | history
fs/xfs/xfs_trans_priv.h diff1 | diff2 | blob | history
Pandora Kernel Repository