You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 038a5008b2 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits) [SKY2]: status polling loop (post merge) [NET]: Fix NAPI completion handling in some drivers. [TCP]: Limit processing lost_retrans loop to work-to-do cases [TCP]: Fix lost_retrans loop vs fastpath problems [TCP]: No need to re-count fackets_out/sacked_out at RTO [TCP]: Extract tcp_match_queue_to_sack from sacktag code [TCP]: Kill almost unused variable pcount from sacktag [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L [TCP]: Add bytes_acked (ABC) clearing to FRTO too [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2 [NETFILTER]: x_tables: add missing ip6t_modulename aliases [NETFILTER]: nf_conntrack_tcp: fix connection reopening [QETH]: fix qeth_main.c [NETLINK]: fib_frontend build fixes [IPv6]: Export userland ND options through netlink (RDNSS support) [9P]: build fix with !CONFIG_SYSCTL [NET]: Fix dev_put() and dev_hold() comments [NET]: make netlink user -> kernel interface synchronious [NET]: unify netlink kernel socket recognition [NET]: cleanup 3rd argument in netlink_sendskb ... Fix up conflicts manually in Documentation/feature-removal-schedule.txt and my new least favourite crap, the "mod_devicetable" support in the files include/linux/mod_devicetable.h and scripts/mod/file2alias.c. (The latter files seem to be explicitly _designed_ to get conflicts when different subsystems work with them - that have an absolutely horrid lack of subsystem separation!) Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		18 years ago
..
b2c2	V4L/DVB (6042): b2c2-flexcop: fix Airstar HD5000 tuning regression	18 years ago
bt8xx	V4L/DVB (6079): Cleanup: remove linux/moduleparam.h from drivers/media files	18 years ago
cinergyT2	V4L/DVB (6125): whitespace cleanup: replace leading spaces with tabs	18 years ago
dvb-core	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	18 years ago
dvb-usb	V4L/DVB (6296): dib0700: add support for AverMedia DVB-T Express card	18 years ago
frontends	V4L/DVB (6241): fix typo in DVB_PLL Kconfig help text	18 years ago
pluto2	V4L/DVB (5745): Dvb: use '+=' instead of '=' for EXTRA_CFLAGS	18 years ago
ttpci	V4L/DVB (6221): budget-ci: select TT keymap for DVB-S TT 1500	18 years ago
ttusb-budget	V4L/DVB (6079): Cleanup: remove linux/moduleparam.h from drivers/media files	18 years ago
ttusb-dec	V4L/DVB (6079): Cleanup: remove linux/moduleparam.h from drivers/media files	18 years ago
Kconfig	Fix Kconfig dependency problems wrt boolean menuconfigs	18 years ago
Makefile	…