From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 15 Sep 2011 13:08:05 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v3.2-rc1~185^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e060c38434b2caa78efe7cedaff4191040b65a15;p=pandora-kernel.git

Merge branch 'master' into for-next

Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
---

e060c38434b2caa78efe7cedaff4191040b65a15
Reading git-diff-tree failed