1
0
Fork 0
alistair23-linux/drivers/media/usb/hdpvr
Mauro Carvalho Chehab a733291d69 Merge commit '67dd8f35c2d8ed80f26c9654b474cffc11c6674d' into patchwork
* .: (268 commits)
  Linux 3.16-rc6
  um: segv: Save regs only in case of a kernel mode fault
  um: Fix hung task in fix_range_common()
  um: Ensure that a stub page cannot get unmapped
  Revert "um: Fix wait_stub_done() error handling"
  btrfs: test for valid bdev before kobj removal in btrfs_rm_device
  Btrfs: fix abnormal long waiting in fsync
  random: check for increase of entropy_count because of signed conversion
  ARM: EXYNOS: Fix core ID used by platsmp and hotplug code
  ahci: add support for the Promise FastTrak TX8660 SATA HBA (ahci mode)
  ARM: at91/dt: add missing clocks property to pwm node in sam9x5.dtsi
  ARM: at91/dt: fix usb0 clocks definition in sam9n12 dtsi
  ARM: at91: at91sam9x5: correct typo error for ohci clock
  irqchip: gic: Fix core ID calculation when topology is read from DT
  GFS2: fs/gfs2/rgrp.c: kernel-doc warning fixes
  GFS2: memcontrol: Spelling s/invlidate/invalidate/
  GFS2: Allow caching of glocks for flock
  GFS2: Allow flocks to use normal glock dq rather than dq_wait
  GFS2: replace count*size kzalloc by kcalloc
  GFS2: Use GFP_NOFS when allocating glocks
  ...

Conflicts:
	drivers/media/dvb-frontends/si2168.c
	drivers/media/dvb-frontends/si2168_priv.h
	drivers/media/tuners/si2157.c
2014-07-22 02:03:59 -03:00
..
Kconfig [media] media: fix hdpvr kconfig/build errors 2013-05-27 08:51:27 -03:00
Makefile [media] move i2c files into drivers/media/i2c 2012-08-15 16:42:14 -03:00
hdpvr-control.c [media] hdpvr: improve error handling 2013-06-13 11:35:47 -03:00
hdpvr-core.c [media] hdpvr: Fix memory leak in debug 2014-02-04 06:43:53 -02:00
hdpvr-i2c.c [media] [V2,23/24] usb/hdpvr/hdpvr-i2c.c: use IS_ENABLED() macro 2013-02-06 09:20:41 -02:00
hdpvr-video.c Merge commit '67dd8f35c2d8ed80f26c9654b474cffc11c6674d' into patchwork 2014-07-22 02:03:59 -03:00
hdpvr.h [media] hdpvr: improve error handling 2013-06-13 11:35:47 -03:00