git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db552b3 339dc50)
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)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.