Merge branch 'stable/for-linus-3.6' into linux-next