Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 01:46:18 +0000 (10:46 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 01:46:18 +0000 (10:46 +0900)
commit54f7fc25e5736c39050454fe6b5a2bed027fbfab
tree89b1d6395360c17d03a5c3900cb274932d12791e
parent0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e
parentc19c6c954b9b264abdc21e0c855118e3daf019b0
Merge git://git./linux/kernel/git/cmetcalf/linux-tile

Pull tile arch update from Chris Metcalf:
 "The bulk of this change is the tile uapi disintegration.  There is
  also a one-line change in here to enable interrupts in
  do_work_pending() to avoid a WARN_ON in _local_bh_enable_ip()."

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: enable interrupts in do_work_pending()
  UAPI: (Scripted) Disintegrate arch/tile/include/asm
  UAPI: (Scripted) Disintegrate arch/tile/include/arch
arch/tile/kernel/process.c