From: Russell King Date: Thu, 5 Jan 2012 12:55:03 +0000 (+0000) Subject: Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD X-Git-Tag: v3.3-rc1~144^2^2~54^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c5f830c4c9d4f19c1eef356c0cd322b46d695c9;p=pandora-kernel.git Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD Conflicts: arch/arm/plat-omap/include/plat/common.h --- 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 Reading git-diff-tree failed