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)
* 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


Trivial merge