Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...
[sfrench/cifs-2.6.git] / arch / um / .gitignore
1 kernel/config.c
2 kernel/config.tmp
3 kernel/vmlinux.lds