Merge branch 'for-linus' of git://git.kernel.dk/linux-block
[pandora-kernel.git] / drivers / net / fs_enet / mac-fcc.c
Simple merge