Merge /spare/repo/linux-2.6/