From: Roland Dreier <roland@purestorage.com>
Date: Wed, 23 Mar 2011 18:13:37 +0000 (-0700)
Subject: Merge branches 'misc', 'nes' and 'srp' into for-next
X-Git-Tag: v2.6.39-rc1~95^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba82638247c10cfda32268c894f78f8124f54084;p=pandora-kernel.git

Merge branches 'misc', 'nes' and 'srp' into for-next
---

ba82638247c10cfda32268c894f78f8124f54084
Reading git-diff-tree failed