summaryrefslogtreecommitdiff
path: root/.gitignore
blob: e46b8179ff61ddd40c95296666ae306b18a76598 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
# Editor crap (emacs, vim, ...)
*.swp
*.orig
\#*\#
.\#*
.*.sw[a-z]
*.un~

# Hidden files, general things
.*
*~

# Compiled object files
*.slo
*.lo
*.o

# Compiled dynamic libraries
*.so

# Compiled static libraries
*.lai
*.la
*.a

# cscope/ctags index files
cscope*
tags

# Testing folders
fuzzing/

# Ignore if someone adapts Makefile
Makefile

# Other documentation ignores
*.md
*.ps

# Compressed archives
*.tar.bz2
*.tar.bz
*.tar.xz

# Release related stuff
.MAIL_MSG

# Excluded from ignorance
!.gitignore
und/soc/fsl/imx-ssi.c?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>sound/soc/fsl/imx-ssi.c parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/soc/fsl/imx-ssi.c')