]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9d0717bd461b29904c205a3b79a061df8d1f0914
treeb9e491ab539a934a579be17cf72b0f7695f757e4
parentd9a36ffd9d7f03dc9cf9d591a9e6752ca7c3fd1e
parent4bc1248a61d412910fff3f42fb682af4f1bad08f
Merge git://git.kernel.org/pub/scm/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