diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-07 14:12:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-07 14:12:54 +1100 |
| commit | a93331296140dc986bedbe0109c3c99a351261d7 (patch) | |
| tree | 873e9dd88eb64a94df81921f9c9c22e2a60f9ea0 /include/linux/workqueue.h | |
| parent | 93e2112dc3189d0a6ce2a53b291ee12fc2f7d791 (diff) | |
| parent | b586d6e1900791bd6ddb4f643fff0b2482baeca6 (diff) | |
Merge remote branch 'percpu/for-next'
Conflicts:
include/linux/percpu.h
mm/percpu.c
Diffstat (limited to 'include/linux/workqueue.h')
0 files changed, 0 insertions, 0 deletions