Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[firefly-linux-kernel-4.4.55.git] / init / version.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2