From: Tejun Heo Date: Tue, 15 Sep 2009 00:57:19 +0000 (+0900) Subject: Merge branch 'for-next' into for-linus X-Git-Tag: v2.6.32-rc1~676^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5579fd7e6aed8860ea0c8e3f11897493153b10ad;p=pandora-kernel.git 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 --- 5579fd7e6aed8860ea0c8e3f11897493153b10ad Reading git-diff-tree failed