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

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

1bc22f731c9a5e7f3130be3030a23c78f47f73f9
Reading git-diff-tree failed