]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Wed, 28 Mar 2012 00:20:21 +0000 (17:20 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 28 Mar 2012 00:25:45 +0000 (17:25 -0700)
* '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


Trivial merge