Merge by hand (conflicts in sd.c)
[firefly-linux-kernel-4.4.55.git] / Documentation / arm / Sharp-LH /
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2