git.baikalelectronics.ru Git - kernel.git/commit

author	Pekka Enberg <penberg@kernel.org>
	Sun, 24 Oct 2010 16:57:05 +0000 (19:57 +0300)
committer	Pekka Enberg <penberg@kernel.org>
	Sun, 24 Oct 2010 16:57:05 +0000 (19:57 +0300)
commit	28412fe46207864afbd5b66e35f0a72fc01adde8
tree	5c235cac699ca86b504850aa663ddadde0455a61	tree \| snapshot
parent	4a1c6b15493d11e75efc70de96c2157fa56c0c8a	commit \| diff
parent	8a94c37bc8c2cb3ce6e61ee5bb24d6c4f9af4139	commit \| diff

Merge branch 'master' into for-linus

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