summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-05 18:26:13 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-05 18:26:13 +0100
commit2a1292b36ba106b9b7f030d3fa130f5f634fd8f0 (patch)
tree12547c03b949e9cfa64c9760be9a73f18bb7a81a /mm
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parent[LRO]: fix lro_gen_skb() alignment (diff)
downloadlinux-2a1292b36ba106b9b7f030d3fa130f5f634fd8f0.tar.xz
linux-2a1292b36ba106b9b7f030d3fa130f5f634fd8f0.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [LRO]: fix lro_gen_skb() alignment [TCP]: NAGLE_PUSH seems to be a wrong way around [TCP]: Move prior_in_flight collect to more robust place [TCP] FRTO: Use of existing funcs make code more obvious & robust [IRDA]: Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS [ROSE]: Trivial compilation CONFIG_INET=n case [IPVS]: Fix sched registration race when checking for name collision. [IPVS]: Don't leak sysctl tables if the scheduler registration fails.
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions