linux/drivers/isdn
Linus Torvalds 597d8c7178 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: (56 commits)
  sky2: Fix oops in sky2_xmit_frame() after TX timeout
  Documentation/3c509: document ethtool support
  af_packet: Don't use skb after dev_queue_xmit()
  vxge: use pci_dma_mapping_error to test return value
  netfilter: ebtables: enforce CAP_NET_ADMIN
  e1000e: fix and commonize code for setting the receive address registers
  e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value
  e1000e: perform 10/100 adaptive IFS only on parts that support it
  e1000e: don't accumulate PHY statistics on PHY read failure
  e1000e: call pci_save_state() after pci_restore_state()
  netxen: update version to 4.0.72
  netxen: fix set mac addr
  netxen: fix smatch warning
  netxen: fix tx ring memory leak
  tcp: update the netstamp_needed counter when cloning sockets
  TI DaVinci EMAC: Handle emac module clock correctly.
  dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips
  ixgbe: Fix compiler warning about variable being used uninitialized
  netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()
  mv643xx_eth: don't include cache padding in rx desc buffer size
  ...

Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c
2010-01-12 20:53:29 -08:00
..
act2000 Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
capi tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
divert headers: remove sched.h from poll.h 2009-10-04 15:05:10 -07:00
gigaset gigaset: don't enable any debugging output by default 2009-12-08 20:30:41 -08:00
hardware Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2010-01-12 20:53:29 -08:00
hisax Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2009-12-14 12:33:02 -08:00
hysdn Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
i4l Merge branch 'for-next' into for-linus 2009-12-07 18:36:35 +01:00
icn Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
isdnloop
mISDN mISDN: use DECLARE_COMPLETION_ONSTACK for non-constant completion 2009-12-18 20:30:11 -08:00
pcbit Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
sc Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
Kconfig
Makefile