From: Mauro Carvalho Chehab Date: Tue, 22 Jul 2014 05:03:59 +0000 (-0300) Subject: Merge commit '67dd8f35c2d8ed80f26c9654b474cffc11c6674d' into patchwork X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a733291d6934d0663af9e7d9f2266ab87a2946cd;p=linux-beck.git 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 --- a733291d6934d0663af9e7d9f2266ab87a2946cd diff --cc drivers/media/dvb-frontends/si2168_priv.h index c1f7a4c39ab5,53f7f06ae343..ebbf502ec313 --- a/drivers/media/dvb-frontends/si2168_priv.h +++ b/drivers/media/dvb-frontends/si2168_priv.h @@@ -22,10 -22,7 +22,10 @@@ #include #include -#define SI2168_FIRMWARE "dvb-demod-si2168-02.fw" +#define SI2168_A20_FIRMWARE "dvb-demod-si2168-a20-01.fw" +#define SI2168_A30_FIRMWARE "dvb-demod-si2168-a30-01.fw" +#define SI2168_B40_FIRMWARE "dvb-demod-si2168-b40-01.fw" - #define SI2168_B40_FIRMWARE_FALLBACK "dvb-demod-si2168-01.fw" ++#define SI2168_B40_FIRMWARE_FALLBACK "dvb-demod-si2168-02.fw" /* state struct */ struct si2168 {