linux-sg2042/drivers/isdn/i4l
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
Kconfig isdn: fix a few Kconfig imperfections 2010-02-22 15:45:53 -08:00
Makefile ISDN: Make isdnhdlc usable for other ISDN drivers 2009-07-25 20:15:21 +02:00
isdn_audio.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
isdn_audio.h
isdn_bsdcomp.c [ISDN]: Get rid of some pointless allocation casts in common and bsd comp. 2007-08-26 18:35:46 -07:00
isdn_common.c isdn: autoconvert trivial BKL users to private mutex 2010-07-12 20:21:47 -07:00
isdn_common.h
isdn_concap.c isdn: Kill directly reference of netdev->priv 2008-12-03 15:49:46 -08:00
isdn_concap.h
isdn_net.c isdn: fix strlen() usage 2010-07-12 20:21:43 -07:00
isdn_net.h isdn: fix possible circular locking dependency 2009-10-22 18:27:53 -07:00
isdn_ppp.c drivers/isdn: Remove unnecessary casts of private_data 2010-07-12 21:13:34 -07:00
isdn_ppp.h
isdn_tty.c i4l: kill big kernel lock 2010-09-15 19:29:55 -07:00
isdn_tty.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
isdn_ttyfax.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
isdn_ttyfax.h
isdn_v110.c isdn: replace __inline with inline 2008-03-05 18:37:39 -08:00
isdn_v110.h
isdn_x25iface.c X25: Use identifiers for isdn device to x25 interface 2010-04-22 16:12:48 -07:00
isdn_x25iface.h
isdnhdlc.c ISDN: Fix isdnhdlc for one byte hdlc packets 2009-07-25 20:16:17 +02:00