Merge tag 'v3.18.104' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable

[email protected] Sat, 16 Jun 2018 06:22:12 +0200

Newsgroups	gmane.linux.ports.mips.cvs
Message-ID	<S23993928AbeFPEWPVF6Nh/[email protected]>

Author: Ralf Baechle <[email protected]> Tue May 15 22:10:52 2018 +0200
Commit: 524b48e7053adc76c28485e5c3d9ff005eeb5c24
Gitweb: https://git.linux-mips.org/g/ralf/linux/524b48e7053a
Branch: linux-3.18-stable

---

 Makefile                                  |    2 +-
 drivers/net/ethernet/freescale/fec_main.c |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)