]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a10c3ac 257c0f9)
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)
commit72d13f482373808b116a9b97e1dc835a1a697864
tree2b0f1e19aa529e77720522d13541adedbc46564etree | snapshot
parenta10c3acdd6e3b05b0824e4150bfe2b500b8f0aa3commit | diff
parent257c0f9c9199f014778d59de412032e86827dd77commit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.