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