From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 10 Dec 2010 14:19:18 +0000 (+0100)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.38-rc1~442^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ade0c1d9d93b7642212657ef76f4a1e30233711;p=pandora-kernel.git

Merge branch 'master' into upstream
---

2ade0c1d9d93b7642212657ef76f4a1e30233711
Reading git-diff-tree failed