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

diff --cc MAINTAINERS
index 7cea7ea606c73d2c22bb3647db534f943438e5bd,4e2a1f67a1fcf00b553e8190947368d240d74b44..376117d5518da2703984a58c624ccbd3fdd328f0
--- 1/MAINTAINERS
--- 2/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 <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ 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 <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/radio/dsbr100.c
 +
  DSCC4 DRIVER
  M:    Francois Romieu <[email protected]>
  L:    [email protected]

diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/dm644x.c
Simple merge

diff --cc drivers/media/platform/omap/omap_vout.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx2_camera.c
index 3c5ba63cd3112ae97d409749907727a25e1144b4,791cd1d54a769c5321cca32d8fa7cc6665467324..28d5c84eef82a8c21ab34175ea83ed61bf975066
--- 1/drivers/media/platform/soc_camera/mx2_camera.c
--- 2/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

diff --cc drivers/media/platform/soc_camera/mx3_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/omap1_camera.c
Simple merge

diff --cc drivers/staging/media/dt3155v4l/dt3155v4l.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_parallel.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_serial.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_sir.c
Simple merge