From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 23 May 2011 17:05:10 +0000 (+0100)
Subject: Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic',... 
X-Git-Tag: v3.0-rc1~328^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b60e5f90dec4ae251386f20464336369e962e9c;p=pandora-kernel.git

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
---

4b60e5f90dec4ae251386f20464336369e962e9c
Reading git-diff-tree failed