1
linux/drivers/media/dvb/dvb-core
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>
2007-10-11 19:40:14 -07:00
..
demux.h
dmxdev.c V4L/DVB (6079): Cleanup: remove linux/moduleparam.h from drivers/media files 2007-10-09 22:06:17 -03:00
dmxdev.h
dvb_ca_en50221.c V4L/DVB (6279): en_50221: convert to kthread API 2007-10-10 00:03:08 -03:00
dvb_ca_en50221.h
dvb_demux.c V4L/DVB (6311): dvb: Replace list_for_each+list_entry with list_for_each_entry 2007-10-10 13:34:33 -03:00
dvb_demux.h V4L/DVB (5512): Fix 3/3 for bug 7819: fixed hotplugging for dvbnet 2007-04-27 15:45:32 -03:00
dvb_filter.c
dvb_filter.h
dvb_frontend.c V4L/DVB (6107): dvb_frontend: clean-up shutdown handling 2007-10-09 22:07:03 -03:00
dvb_frontend.h V4L/DVB (6136): dvb_frontend: add get_rf_strength function pointer to dvb_tuner_ops 2007-10-09 22:07:44 -03:00
dvb_math.c
dvb_math.h
dvb_net.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2007-10-11 19:40:14 -07:00
dvb_net.h V4L/DVB (5512): Fix 3/3 for bug 7819: fixed hotplugging for dvbnet 2007-04-27 15:45:32 -03:00
dvb_ringbuffer.c
dvb_ringbuffer.h
dvbdev.c V4L/DVB (6311): dvb: Replace list_for_each+list_entry with list_for_each_entry 2007-10-10 13:34:33 -03:00
dvbdev.h
Kconfig V4L/DVB (5600): Allow compiling just DVB CORE 2007-05-09 10:12:49 -03:00
Makefile