summaryrefslogtreecommitdiff
path: root/drivers/pnp
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-23 12:32:02 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-23 12:32:02 -0300
commitbf8ebd444cd4780af7e031c1fc1ec5a1141bc9ab (patch)
tree2a5e77951748fe427be25cb7614df1373fdd35a3 /drivers/pnp
parent5d969334204ade2828ba6de4ccfa2e9ef3d4c893 (diff)
parent8cdf1a0d812974ed33868a4c74f62b8d128feff2 (diff)
downloadlinux-3.10-bf8ebd444cd4780af7e031c1fc1ec5a1141bc9ab.tar.gz
linux-3.10-bf8ebd444cd4780af7e031c1fc1ec5a1141bc9ab.tar.bz2
linux-3.10-bf8ebd444cd4780af7e031c1fc1ec5a1141bc9ab.zip
Merge remote-tracking branch 'tizen/tizen' into tizen-media-backports
* tizen/tizen: (119 commits) arm: odroid: cpufreq: Support for frequency up to 1.7 GHz cpufreq: BOOST: Adjust setting of BOOST frequency just before first valid freq s5p-mfc: fix handling for MPEG2 decoding with IOMMU arm: tizen_odroid_defconfig: enable pwm-fan driver media: s5p_mfc: Check the right pointer after allocation hwmon: pwm-fan: fix build error dts: Enable pwm in Exynos4412-odroidu3 and add pwm-fan hwmon: pwm-fan: Add pwm-fan driver odroid: disable dmabuf-sync media: s5p_mfc: remove unnecessary calling to function video_devdata() arm: tizen_odroid_defconfig: enable MAX77686 RTC driver ARM: dts: ODROID i2c improvements ARM: dts: Enable PMIC interrupts on ODROID ASoC: odroidx2_max98090: Rectify module device table name ASoC: odroidx2_max98090: Move clock settings from ops to late_probe ASoC: samsung-i2s: Maintain CDCLK settings across i2s_{shutdown/startup} usbnet: smsc95xx: add reset_resume function with reset operation usb: s3c-hsotg: break infinite loop in endpoint disable code arm: tizen_odroid_defconfig: enable LED heartbeat USB: add reset resume quirk for usb3503 ... Conflicts: arch/arm/configs/tizen_odroid_defconfig drivers/media/v4l2-core/videobuf2-core.c
Diffstat (limited to 'drivers/pnp')
0 files changed, 0 insertions, 0 deletions