Merge HEAD from /spare/repo/linux-2.6/.git