git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
block
/
drbd
/
drbd_receiver.c
diff --git
a/drivers/block/drbd/drbd_receiver.c
b/drivers/block/drbd/drbd_receiver.c
index
fe1564c
..
fd26666
100644
(file)
--- a/
drivers/block/drbd/drbd_receiver.c
+++ b/
drivers/block/drbd/drbd_receiver.c
@@
-862,7
+862,7
@@
retry:
msock->sk->sk_rcvtimeo = mdev->net_conf->ping_int*HZ;
/* we don't want delays.
- * we use TCP_CORK where apropriate, though */
+ * we use TCP_CORK where ap
p
ropriate, though */
drbd_tcp_nodelay(sock);
drbd_tcp_nodelay(msock);