From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Jun 2012 16:06:13 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0c30989cc9792bfef6b8844de1d4c7d724e48202;p=openwrt%2Fstaging%2Fblogic.git

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
---

0c30989cc9792bfef6b8844de1d4c7d724e48202