summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/include/mach/timex.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 09:03:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 09:03:02 -0700
commitfa5312d9e87e7222c6c384c4e930dc149bc1178d (patch)
tree3a181e52c7ae863de566a6b30248a175742a8406 /arch/arm/mach-mmp/include/mach/timex.h
parent9c688c114c4665ac8c6da05b2f6b987f4adc6dae (diff)
parent4d707b9f48e2c4aa94b96f1133813b73df71fb55 (diff)
downloadblackbird-op-linux-fa5312d9e87e7222c6c384c4e930dc149bc1178d.tar.gz
blackbird-op-linux-fa5312d9e87e7222c6c384c4e930dc149bc1178d.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: change cancel_work_sync() to clear work->data workqueue: warn about flush_scheduled_work()
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/timex.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud