Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
[firefly-linux-kernel-4.4.55.git] / drivers / mtd / lpddr /
drwxr-xr-x   ..
-rw-r--r-- 673 Kconfig
-rw-r--r-- 127 Makefile
-rw-r--r-- 20838 lpddr_cmds.c
-rw-r--r-- 7805 qinfo_probe.c