| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Tue Sep 15 09:57:19 2009 +0900 |
| committer | Tejun Heo <tj@kernel.org> | Tue Sep 15 09:57:19 2009 +0900 |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 | |
| parent | 04a13c7c632e1fe04a5f6e6c83565d2559e37598 [diff] | |
| parent | c2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8 [diff] |
Merge branch 'for-next' into for-linus * pcpu_chunk_page_occupied() doesn't exist in for-next. * pcpu_chunk_addr_search() updated to use raw_smp_processor_id(). Conflicts: mm/percpu.c