pf-deb-Thinkpad-x61s
arch-Thinkpad-x61s
Merge branch 'master' of https://github.com/hozeyzachary/kernel

Conflicts:
	config