summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2013-04-11 13:16:34 +0200
committerTobias Klauser <tklauser@distanz.ch>2013-04-11 13:16:34 +0200
commita692c4817c1a5fc3f5b58b6787c620a272f9e69b (patch)
treed3791ef109e916bf5b11f245c2dd390d944f7174 /configs
parenta4703f2a060a81397da497b85bc135187f0f89e9 (diff)
man: netsniff-ng: Fix a typo
Replace 'networkoing' by 'networking'. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'configs')
0 files changed, 0 insertions, 0 deletions
=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>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/sti/uniperif.h')