tree 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27
parent 04a13c7c632e1fe04a5f6e6c83565d2559e37598
parent c2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8
author Tejun Heo <tj@kernel.org> 1252976239 +0900
committer Tejun Heo <tj@kernel.org> 1252976239 +0900

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