Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jun 2012 16:06:13 +0000 (09:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jun 2012 16:06:13 +0000 (09:06 -0700)
commit0c30989cc9792bfef6b8844de1d4c7d724e48202
treed8789ecd5d1f56e6b5a93386ff1bd3f0a9e4d7b5
parent71fae7e714749a52cb8be777ec014f82e8a747f4
parent2ded5c2484d7375860bdb5f3df1954a346a2da26
Merge git://git./linux/kernel/git/cmetcalf/linux-tile

Pull tile fixes from Chris Metcalf:
 "These two minor bug fixes fix build failures from some changes that
  were merged in during the 3.5 merge window."

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: add #include to unbreak build after generic init_task conversion
  tile: remove cpu_idle_on_new_stack