Merge branch 'for-next' into for-linus
authorTejun Heo <tj@kernel.org>
Tue, 15 Sep 2009 00:57:19 +0000 (09:57 +0900)
committerTejun Heo <tj@kernel.org>
Tue, 15 Sep 2009 00:57:19 +0000 (09:57 +0900)
commit5579fd7e6aed8860ea0c8e3f11897493153b10ad
tree8f797ccd0f1a2c88f1605ae9e90b3ac17485de27
parent04a13c7c632e1fe04a5f6e6c83565d2559e37598
parentc2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8
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
mm/percpu.c