From: Roland Dreier <roland@purestorage.com>
Date: Thu, 17 Feb 2011 22:04:59 +0000 (-0800)
Subject: Merge branches 'nes' and 'qib' into for-next
X-Git-Tag: v2.6.38-rc6~26^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=814b0a61204d24f9fba6f7c575e6450d15ce2cf1;p=pandora-kernel.git

Merge branches 'nes' and 'qib' into for-next
---

814b0a61204d24f9fba6f7c575e6450d15ce2cf1
Reading git-diff-tree failed