kernel-ark/drivers/media/dvb
Linus Torvalds f8965467f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
2010-05-20 21:04:44 -07:00
..
b2c2
bt8xx V4L/DVB: drivers/media: drop redundant memset 2010-05-18 00:46:51 -03:00
dm1105 V4L/DVB: ir-core: remove ir-functions usage from dm1105 2010-05-19 12:57:45 -03:00
dvb-core Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
dvb-usb Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2010-05-20 09:37:45 -07:00
firewire V4L/DVB: firedtv: correct version number and current/next in CA_PMT 2010-05-18 00:46:27 -03:00
frontends V4L/DVB: dvb/stv6110x: cleanup error handling 2010-05-19 12:59:12 -03:00
mantis V4L/DVB: ir: prepare IR code for a parameter change at register function 2010-05-19 12:56:50 -03:00
ngene V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig 2010-05-19 12:59:11 -03:00
pluto2 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pt1 V4L/DVB: pt1: Support Earthsoft PT2 2010-05-19 12:57:32 -03:00
siano include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ttpci V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer dereference" 2010-05-19 12:57:17 -03:00
ttusb-budget
ttusb-dec
Kconfig V4L/DVB: ngene: Driver compiles now 2010-02-26 15:10:53 -03:00
Makefile V4L/DVB: ngene: Driver compiles now 2010-02-26 15:10:53 -03:00