Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into...