Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc