summaryrefslogtreecommitdiff
path: root/.gitignore
AgeCommit message (Expand)AuthorFilesLines
2013-07-09configure: let configure script generate config.h fileDaniel Borkmann1-0/+1
2013-06-24gitignore: Ignore generated ConfigTobias Klauser1-0/+3
2013-05-21misc: Ignore files generated by cscope/ctagsTobias Klauser1-0/+4
2013-05-05misc: move file to source rootDaniel Borkmann1-1/+1
2013-03-15build: add make release targetDaniel Borkmann1-0/+3
2013-03-15all: import netsniff-ng 0.5.8-rc0 sourceDaniel Borkmann1-0/+42
0545e5184c1c47b'>sound/soc/codecs/tas5720.h 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/codecs/tas5720.h')