From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 23 Apr 2013 19:52:14 +0000 (-0400)
Subject: Merge branch 'bugfixes' into linux-next
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~98^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0212b84fb19cf89305ab96c73abdf3a76d05ef8;p=pandora-kernel.git

Merge branch 'bugfixes' into linux-next

Fix up a conflict between the linux-next branch and mainline.
Conflicts:
	fs/nfs/nfs4proc.c
---

b0212b84fb19cf89305ab96c73abdf3a76d05ef8
Reading git-diff-tree failed