From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 7 May 2012 15:23:27 +0000 (-0600)
Subject: Merge branch 'topic/stratus' into next
X-Git-Tag: v3.5-rc1~179^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cbaa57d828aa0a067e06d3c6d795b12ae9fb776;p=pandora-kernel.git

Merge branch 'topic/stratus' into next
---

0cbaa57d828aa0a067e06d3c6d795b12ae9fb776
Reading git-diff-tree failed