From: Tony Lindgren <tony@atomide.com>
Date: Mon, 6 Jun 2011 11:30:30 +0000 (-0700)
Subject: Merge branch 'linus' into fix-cbus-mismerge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8383929c08d97a4bab2751d6aef6b2755acd7856;p=pandora-kernel.git

Merge branch 'linus' into fix-cbus-mismerge
---

8383929c08d97a4bab2751d6aef6b2755acd7856
Reading git-diff-tree failed