From: Simon Horman Date: Tue, 30 Oct 2012 07:34:14 +0000 (+0800) Subject: Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards' and 'heads/soc' into... X-Git-Tag: next-20121101~12^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=af021e3637c75257fa9941f300cb076ef85c49e2;p=karo-tx-linux.git Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards' and 'heads/soc' into next Conflicts: arch/arm/configs/marzen_defconfig --- af021e3637c75257fa9941f300cb076ef85c49e2