| commit | 6113f39dd15e4beb5ce66a8e0d9062477c5e81e3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 20 17:53:50 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 20 17:53:50 2011 -0700 |
| tree | b9e491ab539a934a579be17cf72b0f7695f757e4 | |
| parent | db552b3331766e16c35550a4b83c3a42671ba73e [diff] | |
| parent | 339dc50e59f4ea697e2b8cd6296328a8015a6c21 [diff] |
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