From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Fri, 21 Aug 2009 15:27:29 +0000 (-0400)
Subject: Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6... 
X-Git-Tag: v2.6.32-rc1~412^2~48
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9dc122166b8d863d3057a66ada04838e5548e52;p=pandora-kernel.git

Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming

Conflicts:
	net/sunrpc/cache.c
---

e9dc122166b8d863d3057a66ada04838e5548e52
Reading git-diff-tree failed