Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c