q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/media/radio
History
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
..
si470x V4L/DVB: v4l: radio: si470x: fix unneeded free_irq() call 2010-09-30 07:22:41 -03:00
dsbr100.c V4L/DVB (11957): dsbr100: change radio->muted to radio->status, update suspend/resume 2009-06-16 19:07:36 -03:00
Kconfig V4L/DVB: radio_timberdale: depends on I2c 2010-02-26 15:11:02 -03:00
Makefile V4L/DVB: radio: Add radio-timb 2010-02-26 15:10:56 -03:00
radio-aimslab.c V4L/DVB (13547): radio: add trivial checks on the tuner and type args. 2009-12-16 00:17:53 -02:00
radio-aztech.c V4L/DVB (13547): radio: add trivial checks on the tuner and type args. 2009-12-16 00:17:53 -02:00
radio-cadet.c headers: remove sched.h from poll.h 2009-10-04 15:05:10 -07:00
radio-gemtek-pci.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
radio-gemtek.c V4L/DVB (11391): pci-isa radios: remove open and release functions 2009-04-06 21:44:30 -03:00
radio-maestro.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
radio-maxiradio.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
radio-miropcm20.c media/radio: New driver for the radio FM module on Miro PCM20 sound card 2009-11-27 13:26:23 +01:00
radio-mr800.c V4L/DVB: radio-am800: let v4l2_device_(un)register handle usb_get/set_intfdata 2010-05-19 12:58:56 -03:00
radio-rtrack2.c V4L/DVB (13547): radio: add trivial checks on the tuner and type args. 2009-12-16 00:17:53 -02:00
radio-sf16fmi.c V4L/DVB (13609): radio-sf16fmi: add autoprobing 2009-12-16 00:18:40 -02:00
radio-sf16fmr2.c V4L/DVB (13547): radio: add trivial checks on the tuner and type args. 2009-12-16 00:17:53 -02:00
radio-si4713.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
radio-tea5764.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
radio-terratec.c V4L/DVB (13547): radio: add trivial checks on the tuner and type args. 2009-12-16 00:17:53 -02:00
radio-timb.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
radio-trust.c V4L/DVB (13547): radio: add trivial checks on the tuner and type args. 2009-12-16 00:17:53 -02:00
radio-typhoon.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
radio-zoltrix.c V4L/DVB (13547): radio: add trivial checks on the tuner and type args. 2009-12-16 00:17:53 -02:00
saa7706h.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
si4713-i2c.c V4L/DVB: media/radio: fix copy_to_user to user handling 2010-08-02 15:28:51 -03:00
si4713-i2c.h V4L/DVB (12552): FM TX: si4713: Add files to handle si4713 i2c device 2009-09-12 12:19:20 -03:00
tef6862.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