Neal Cardwell
f4f9f6e75d
tcp: restore formatting of macros for tcp_skb_cb sacked field
...
Commit b82d1bb4 inadvertendly placed unrelated new code between
TCPCB_EVER_RETRANS and TCPCB_RETRANS and the other macros that refer
to the sacked field in the struct tcp_skb_cb (probably because there
was a misleading empty line there). This commit fixes up the
formatting so that all macros related to the sacked field are adjacent
again.
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-16 14:38:16 -04:00
..
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
asm-generic
asm-generic: add linux/types.h to cmpxchg.h
2012-04-02 14:41:27 -07:00
crypto
crypto: user - Fix lookup of algorithms with IV generator
2012-03-29 19:52:47 +08:00
drm
Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
2012-04-12 17:42:01 +01:00
keys
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-15 13:19:04 -04:00
math-emu
media
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
misc
mtd
net
tcp: restore formatting of macros for tcp_skb_cb sacked field
2012-04-16 14:38:16 -04:00
pcmcia
rdma
rxrpc
scsi
SCSI updates on 20120331
2012-03-31 13:31:23 -07:00
sound
ALSA: hda - hide HDMI/ELD printks unless snd.debug=2
2012-04-10 14:53:55 +02:00
target
trace
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-04-04 10:04:42 -07:00
video
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
2012-03-27 18:17:02 -07:00
xen
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
Kbuild