Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / net / ethernet / freescale / fs_enet / fs_enet-main.c

diff --cc drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
Simple merge