linux-sg2042/drivers/media/dvb
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
..
b2c2 V4L/DVB (12294): b2c2: Use dvb-pll for Cablestar2 2009-09-12 12:17:52 -03:00
bt8xx Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
dm1105 V4L/DVB: fix Kconfig to depends on VIDEO_IR 2010-08-12 15:07:57 -03:00
dvb-core Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
dvb-usb V4L/DVB: dib7000p: add disable sample and hold, and diversity delay parameter 2010-09-27 22:21:58 -03:00
firewire llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
frontends V4L/DVB: dib7000p: add disable sample and hold, and diversity delay parameter 2010-09-27 22:21:58 -03:00
mantis V4L/DVB: mantis: Fix IR_CORE dependency 2010-08-24 10:42:08 -07:00
ngene V4L/DVB: ngene: remove unused #include <linux/version.h> 2010-06-01 01:23:22 -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 V4L/DVB: dvb: fix smscore_getbuffer() logic 2010-09-27 22:21:59 -03:00
ttpci Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
ttusb-budget V4L/DVB (10149): ttusb-budget: make it depend on PCI 2009-01-02 17:12:21 -02:00
ttusb-dec USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
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