From: Pekka Enberg <penberg@kernel.org>
Date: Sun, 24 Oct 2010 16:57:05 +0000 (+0300)
Subject: Merge branch 'master' into for-linus
X-Git-Tag: v2.6.37-rc1~141^2
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=6d4121f6c20a0e86231d52f535f1c82423b3326f;p=net-next-2.6.git

Merge branch 'master' into for-linus

Conflicts:
	include/linux/percpu.h
	mm/percpu.c
---

6d4121f6c20a0e86231d52f535f1c82423b3326f