linux/drivers/isdn/hardware/eicon
Linus Torvalds 5f05647dd8 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: (1699 commits)
  bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
  vlan: Calling vlan_hwaccel_do_receive() is always valid.
  tproxy: use the interface primary IP address as a default value for --on-ip
  tproxy: added IPv6 support to the socket match
  cxgb3: function namespace cleanup
  tproxy: added IPv6 support to the TPROXY target
  tproxy: added IPv6 socket lookup function to nf_tproxy_core
  be2net: Changes to use only priority codes allowed by f/w
  tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
  tproxy: added tproxy sockopt interface in the IPV6 layer
  tproxy: added udp6_lib_lookup function
  tproxy: added const specifiers to udp lookup functions
  tproxy: split off ipv6 defragmentation to a separate module
  l2tp: small cleanup
  nf_nat: restrict ICMP translation for embedded header
  can: mcp251x: fix generation of error frames
  can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
  can-raw: add msg_flags to distinguish local traffic
  9p: client code cleanup
  rds: make local functions/variables static
  ...

Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and
drivers/net/wireless/ath/ath9k/debug.c as per David
2010-10-23 11:47:02 -07:00
..
adapter.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
capi20.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
capidtmf.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
capidtmf.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
capifunc.c Spelling fix: explicitly 2007-10-19 23:22:55 +02:00
capifunc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
capimain.c 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
cardtype.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cp_vers.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dadapter.c [PATCH] drivers/isdn/: make some code static 2005-06-28 21:20:31 -07:00
dadapter.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
debug_if.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
debug.c eicon: make buffer larger 2010-10-06 23:30:39 -07:00
debuglib.c Typoes: "whith" -> "with" 2008-02-03 15:14:02 +02:00
debuglib.h eicon: make buffer larger 2010-10-06 23:30:39 -07:00
dfifo.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
di_dbg.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
di_defs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
di.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
di.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
did_vers.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
diddfunc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
diva_didd.c proc_fops: convert drivers/isdn/ to seq_file 2010-01-14 03:10:54 -08:00
diva_dma.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
diva_dma.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
diva_pci.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
diva.c Remove pointless casts from void pointers 2008-02-06 10:41:01 -08:00
diva.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
divacapi.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
divamnt.c isdn: autoconvert trivial BKL users to private mutex 2010-07-12 20:21:47 -07:00
divasfunc.c isdn/diva: fix section mismatch 2007-06-08 17:23:33 -07:00
divasi.c isdn: autoconvert trivial BKL users to private mutex 2010-07-12 20:21:47 -07:00
divasmain.c isdn/eicon: don't call flush_scheduled_work() from diva_os_remove_soft_isr() 2010-10-17 11:25:03 +02:00
divasproc.c proc_fops: convert drivers/isdn/ to seq_file 2010-01-14 03:10:54 -08:00
divasync.h Fix occurrences of "the the " 2007-05-09 08:57:56 +02:00
dqueue.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dqueue.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dsp_defs.h [PATCH] EICON ISDN: Removed unused definitions for OS_SEEK_* 2006-10-01 00:39:21 -07:00
dsp_tst.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dspdids.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dsrv4bri.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dsrv_bri.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dsrv_pri.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
entity.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
helpers.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
idifunc.c i4l: leak in eicon/idifunc.c 2007-07-17 10:23:06 -07:00
io.c [PATCH] drivers/isdn: Handcrafted MIN/MAX Macro removal 2006-12-08 08:29:01 -08:00
io.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
istream.c [PATCH] drivers/isdn: Handcrafted MIN/MAX Macro removal 2006-12-08 08:29:01 -08:00
Kconfig Use menuconfig objects: ISDN: CONFIG_CAPI_EICON 2007-07-17 10:23:06 -07:00
kst_ifc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
maintidi.c Merge branch 'for-next' into for-linus 2009-12-07 18:36:35 +01:00
maintidi.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
man_defs.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mdm_msg.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
message.c i4l: change magic numbers in Eicon DIVA ISDN driver to symbolic names 2010-03-15 15:47:02 -07:00
mi_pc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mntfunc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
os_4bri.c ISDN: ARRAY_SIZE changes 2009-07-25 20:23:05 +02:00
os_4bri.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
os_bri.c fix similar typos to successfull 2009-01-08 08:31:15 -08:00
os_bri.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
os_capi.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
os_pri.c fix similar typos to successfull 2009-01-08 08:31:15 -08:00
os_pri.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pc_init.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pc_maint.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pkmaint.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
platform.h header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
pr_pc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
s_4bri.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
s_bri.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
s_pri.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sdp_hdr.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
um_idi.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
um_idi.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
um_xdi.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
xdi_adapter.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
xdi_msg.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
xdi_vers.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00