x
Merge branch 'master' of https://github.com/exchb/linux-kernel-note

Conflicts:
	linux-2.6.32/kernel/sched.c