From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 4 Aug 2011 17:04:12 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
X-Git-Tag: v3.2-rc1~169^2^2~864^2~132^2~63
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c25bdbe2886327aedc2248c7227931eaee483f25;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/gregkh/staging-2.6
---

c25bdbe2886327aedc2248c7227931eaee483f25
Reading git-diff-tree failed