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


Trivial merge