From: Linus Torvalds Date: Mon, 21 Mar 2011 00:53:50 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile X-Git-Tag: v2.6.39-rc1~408 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6113f39dd15e4beb5ce66a8e0d9062477c5e81e3;p=platform%2Fkernel%2Flinux-stable.git 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 arch/tile: fix futex sanitization definition/prototype mismatch --- 6113f39dd15e4beb5ce66a8e0d9062477c5e81e3