summaryrefslogtreecommitdiff
path: root/INSTALL
AgeCommit message (Expand)AuthorFilesLines
2013-05-14docs: add note about zsh and vim filesDaniel Borkmann1-1/+6
2013-05-13docs: update install document to current repo statusDaniel Borkmann1-6/+7
2013-05-13staging: add mausezahn staging directoryDaniel Borkmann1-10/+3
2013-05-06docs: install: mention recommended toolsDaniel Borkmann1-2/+2
2013-04-11docs: install: update mausezahn locationDaniel Borkmann1-1/+1
2013-03-17nacl scripts: include common header and rename build_nacl.shDaniel Borkmann1-3/+3
2013-03-15all: import netsniff-ng 0.5.8-rc0 sourceDaniel Borkmann1-0/+160
lspan='2' class='oid'>76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (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 'tools/perf/ui')