Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Mar 2011 00:53:50 +0000 (17:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Mar 2011 00:53:50 +0000 (17:53 -0700)
commit6113f39dd15e4beb5ce66a8e0d9062477c5e81e3
treeb9e491ab539a934a579be17cf72b0f7695f757e4
parentdb552b3331766e16c35550a4b83c3a42671ba73e
parent339dc50e59f4ea697e2b8cd6296328a8015a6c21
Merge git://git./linux/kernel/git/cmetcalf/linux-tile

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  asm-generic: support clock_adjtime() in <asm-generic/unistd.h>
  arch/tile: fix futex sanitization definition/prototype mismatch