Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux