From: Mauro Carvalho Chehab Date: Thu, 27 Dec 2012 14:44:11 +0000 (-0200) Subject: Merge tag 'v3.8-rc1' into staging/for_v3.9 X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=commitdiff_plain;h=a44dca1717ce2c2381339e21c07d1731a63a7888 Merge tag 'v3.8-rc1' into staging/for_v3.9 Linux 3.8-rc1 * tag 'v3.8-rc1': (10696 commits) Linux 3.8-rc1 Revert "nfsd: warn on odd reply state in nfsd_vfs_read" ARM: dts: fix duplicated build target and alphabetical sort out for exynos dm stripe: add WRITE SAME support dm: remove map_info dm snapshot: do not use map_context dm thin: dont use map_context dm raid1: dont use map_context dm flakey: dont use map_context dm raid1: rename read_record to bio_record dm: move target request nr to dm_target_io dm snapshot: use per_bio_data dm verity: use per_bio_data dm raid1: use per_bio_data dm: introduce per_bio_data dm kcopyd: add WRITE SAME support to dm_kcopyd_zero dm linear: add WRITE SAME support dm: add WRITE SAME support dm: prepare to support WRITE SAME dm ioctl: use kmalloc if possible ... Conflicts: MAINTAINERS --- a44dca1717ce2c2381339e21c07d1731a63a7888 diff --cc MAINTAINERS index 7cea7ea606c7,4e2a1f67a1fc..376117d5518d --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2598,13 -2549,15 +2602,22 @@@ S: Supporte F: drivers/gpu/drm/exynos F: include/drm/exynos* + DRM DRIVERS FOR NVIDIA TEGRA + M: Thierry Reding + L: dri-devel@lists.freedesktop.org + L: linux-tegra@vger.kernel.org + T: git git://gitorious.org/thierryreding/linux.git + S: Maintained + F: drivers/gpu/drm/tegra/ + F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt + +DSBR100 USB FM RADIO DRIVER +M: Alexey Klimov +L: linux-media@vger.kernel.org +T: git git://linuxtv.org/media_tree.git +S: Maintained +F: drivers/media/radio/dsbr100.c + DSCC4 DRIVER M: Francois Romieu L: netdev@vger.kernel.org diff --cc drivers/media/platform/soc_camera/mx2_camera.c index 3c5ba63cd311,791cd1d54a76..28d5c84eef82 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c @@@ -1394,8 -1437,10 +1437,8 @@@ static int mx2_camera_try_fmt(struct so return -EINVAL; } - /* FIXME: implement MX27 limits */ - /* limit to MX25 hardware capabilities */ - if (cpu_is_mx25()) { + if (is_imx25_camera(pcdev)) { if (xlate->host_fmt->bits_per_sample <= 8) width_limit = 0xffff * 4; else