diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 08:40:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 08:40:56 -0700 |
commit | 5e686019df425a4fd8003ce7f6eaccbe537331d8 (patch) | |
tree | cc78762bc0fb471562ca1b5f745834a983020623 /fs/cifs/cifs_unicode.h | |
parent | e09b4e9a8d15dce04bedf1b860abeec00de31aad (diff) | |
parent | cd7240c0b900eb6d690ccee088a6c9b46dae815a (diff) |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, tsc, sched: Recompute cyc2ns_offset's during resume from sleep states
sched: Fix rq->clock synchronization when migrating tasks
Diffstat (limited to 'fs/cifs/cifs_unicode.h')
0 files changed, 0 insertions, 0 deletions