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)
commit88b48684fe2d4f6207223423227c80d5408bccaf
tree856e9ce9f7b1ec5d94569925ac78c38daef71317
parentb521d929b330d665cb3a42b26eaaa5690dc9dad7
parent7175f80ba38a6b056508c4eadaab829593abbf2b
Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git./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