summaryrefslogtreecommitdiff
path: root/contrib/webcscope
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2010-01-04 14:13:27 +0100
committerTobias Klauser <tklauser@distanz.ch>2010-01-04 14:15:28 +0100
commit1c7003c9aaa63d40987078770ba25153d9838dad (patch)
treec804d8ba873ca9950b39d3b437eb3f0a9c03960f /contrib/webcscope
parent27612087400a3c8fdffc7e03ef5dff1e9c05087f (diff)
Fix spelling error in ocs.1
This fixes a "spelling-error-in-manpage" lintian warning. Also remove trailing whitespaces.
Diffstat (limited to 'contrib/webcscope')
0 files changed, 0 insertions, 0 deletions
ef='/cgit.cgi/linux/net-next.git/commit/sound/soc/samsung/s3c-i2s-v2.c?h=nds-private-remove&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>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/samsung/s3c-i2s-v2.c')