From: Russell King Date: Mon, 21 May 2012 14:15:33 +0000 (+0100) Subject: Merge branch 'v3-removal' into for-linus X-Git-Tag: v3.5-rc1~182^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4ab1056766a4e49f6b9ef324313dd1583f8f8f4e;p=karo-tx-linux.git Merge branch 'v3-removal' into for-linus Conflicts: arch/arm/boot/compressed/head.S --- 4ab1056766a4e49f6b9ef324313dd1583f8f8f4e