alistair23-linux/drivers/media/dvb
Linus Torvalds 8a9ea3237e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.
2011-10-25 13:25:22 +02:00
..
b2c2 net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
bt8xx [media] dvb-bt8xx: Don't return -EFAULT when a device is not found 2011-07-27 17:53:37 -03:00
ddbridge [media] drxk: Move I2C address into a config structure 2011-07-27 17:55:48 -03:00
dm1105 net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
dvb-core net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
dvb-usb doc: fix broken references 2011-09-27 18:08:04 +02:00
firewire [media] firedtv: change some -EFAULT returns to more fitting error codes 2011-07-27 17:53:38 -03:00
frontends doc: fix broken references 2011-09-27 18:08:04 +02:00
mantis net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
ngene [media] drxk: Move I2C address into a config structure 2011-07-27 17:55:48 -03:00
pluto2 net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
pt1 [media] Fix panic on loading earth-pt1 2011-05-20 09:29:33 -03:00
siano [media] siano: bad parameter is -EINVAL and not -EFAULT 2011-07-27 17:53:36 -03:00
ttpci [media] budget-ci: Add support for TT S-1500 with BSBE1-D01A tuner 2011-05-20 09:28:30 -03:00
ttusb-budget [media] ttusb-budget: driver has a debug param, use it 2011-05-20 09:27:38 -03:00
ttusb-dec Fix common misspellings 2011-03-31 11:26:23 -03:00
Kconfig [media] ddbridge: Allow compiling of the driver 2011-07-27 17:55:45 -03:00
Makefile [media] ddbridge: Allow compiling of the driver 2011-07-27 17:55:45 -03:00