]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd13d6853d2786d7b84acc22197aff47d912f4d8f
tree8f797ccd0f1a2c88f1605ae9e90b3ac17485de27
parentb7393a527452626c21a383947ef2b8f54fc9066c
parent09db98092c4e13b6abfaae3abf4c47c1f9f1f04e
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