Merge branch 'robherring/for-next' from git://sources.calxeda.com/kernel/linux.git