tree 5c235cac699ca86b504850aa663ddadde0455a61
parent 92a5bbc11ff2442a54b2f1d313088c245828ef4e
parent 35da7a307c535f9c2929cae277f3df425c9f9b1e
author Pekka Enberg <penberg@kernel.org> 1287939425 +0300
committer Pekka Enberg <penberg@kernel.org> 1287939425 +0300

Merge branch 'master' into for-linus

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