Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend...
[pandora-kernel.git] / arch / um / .gitignore
1 kernel/config.c
2 kernel/config.tmp
3 kernel/vmlinux.lds