Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Dec 2010 18:28:54 +0000 (10:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Dec 2010 18:28:54 +0000 (10:28 -0800)
commit0a59228168d3722b71f8e3dbc623316fb4be78f4
tree90533da9ccb9cc79b05cfc1198c67365d251df4d
parent2ba16c4f456eb63f54b1d8b065377d41a1cd6a14
parent81711cee933599fa114abb0d258d8bbabef8adfb
Merge git://git./linux/kernel/git/cmetcalf/linux-tile

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: handle rt_sigreturn() more cleanly
  arch/tile: handle CLONE_SETTLS in copy_thread(), not user space