Merge branch 'fman-next' of git://git.freescale.com/ppc/upstream/linux