From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Tue, 4 May 2010 15:27:05 +0000 (-0400)
Subject: Merge commit 'v2.6.34-rc6'
X-Git-Tag: v2.6.35-rc1~489^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5306293c9cd2caf41849cc909281bda628bb989e;p=pandora-kernel.git

Merge commit 'v2.6.34-rc6'

Conflicts:
	fs/nfsd/nfs4callback.c
---

5306293c9cd2caf41849cc909281bda628bb989e
Reading git-diff-tree failed