linux/drivers/isdn/mISDN
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
..
clock.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
core.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
core.h mISDN: Add ISDN sample clock API to mISDN core 2009-01-09 22:44:27 +01:00
dsp_audio.c mISDN: Cleanup debug messages 2009-05-25 00:55:45 -07:00
dsp_biquad.h Add mISDN DSP 2008-07-27 01:56:38 +02:00
dsp_blowfish.c Add mISDN DSP 2008-07-27 01:56:38 +02:00
dsp_cmx.c drivers/isdn: Adjust confusing if indentation 2010-08-16 21:06:30 -07:00
dsp_core.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
dsp_dtmf.c mISDN: Fix DTMF detection enable/disable 2009-05-25 00:55:47 -07:00
dsp_ecdis.h mISDN: Cleanup debug messages 2009-05-25 00:55:45 -07:00
dsp_hwec.c drivers/isdn/mISDN: use ARRAY_SIZE 2008-12-03 20:59:57 -08:00
dsp_hwec.h Add mISDN DSP 2008-07-27 01:56:38 +02:00
dsp_pipeline.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
dsp_tones.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
dsp.h mISDN: Fix DTMF detection enable/disable 2009-05-25 00:55:47 -07:00
fsm.c
fsm.h
hwchannel.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
Kconfig trivial: fix typos/grammar errors in Kconfig texts 2009-03-30 15:22:01 +02:00
l1oip_codec.c mISDN: DSP now uses ring buffer for echo canceler 2009-05-25 00:51:30 -07:00
l1oip_core.c drivers/isdn: Adjust confusing if indentation 2010-08-16 21:06:30 -07:00
l1oip.h mISDN: Use kernel_{send,recv}msg instead of open coding 2009-05-25 00:55:46 -07:00
layer1.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
layer1.h
layer2.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
layer2.h mISDN: Fix TEI and SAPI handling 2009-05-25 00:51:35 -07:00
Makefile mISDN: Add ISDN sample clock API to mISDN core 2009-01-09 22:44:27 +01:00
socket.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
stack.c misdn: kill big kernel lock 2010-09-15 19:29:56 -07:00
tei.c fix comment/printk typos concerning "already" 2010-07-11 21:45:40 +02:00
timerdev.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00