From: Olof Johansson Date: Wed, 28 Mar 2012 00:20:21 +0000 (-0700) Subject: Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v3.4-rc1~34^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88b48684fe2d4f6207223423227c80d5408bccaf;p=people%2Fms%2Flinux.git Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup2 * 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: Include assembler.h in sleep.S to fix build break --- 88b48684fe2d4f6207223423227c80d5408bccaf