git.ipfire.org Git - people/ms/linux.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	6d4121f6c20a0e86231d52f535f1c82423b3326f
tree	5c235cac699ca86b504850aa663ddadde0455a61	tree \| snapshot
parent	92a5bbc11ff2442a54b2f1d313088c245828ef4e	commit \| diff
parent	35da7a307c535f9c2929cae277f3df425c9f9b1e	commit \| diff

Merge branch 'master' into for-linus

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