From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 25 Jul 2012 12:33:45 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: v3.6-rc1~75^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cef081c71dd4e16a01a1e63cedab21eef8b5735;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into fixes

The merge of the 'clk-for-linus' branch caused an automated
merge failure. Pull that in here so we can fix the problem.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

8cef081c71dd4e16a01a1e63cedab21eef8b5735
Reading git-diff-tree failed