From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Sun, 13 Jul 2014 19:22:02 +0000 (-0400)
Subject: Merge branch 'bugfixes' into linux-next
X-Git-Tag: cleanup-for-v3.18~41^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e655f945cd7ba2a8360ddd5462ca535a3b41e07e;p=pandora-kernel.git

Merge branch 'bugfixes' into linux-next

* bugfixes:
  NFS: Don't reset pg_moreio in __nfs_pageio_add_request
  NFS: Remove 2 unused variables
  nfs: handle multiple reqs in nfs_wb_page_cancel
  nfs: handle multiple reqs in nfs_page_async_flush
  nfs: change find_request to find_head_request
  nfs: nfs_page should take a ref on the head req
  nfs: mark nfs_page reqs with flag for extra ref
  nfs: only show Posix ACLs in listxattr if actually present

Conflicts:
	fs/nfs/write.c
---

e655f945cd7ba2a8360ddd5462ca535a3b41e07e
Reading git-diff-tree failed