Merge tag 'v3.8-rc1' into staging/for_v3.9
authorMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 27 Dec 2012 14:44:11 +0000 (12:44 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 27 Dec 2012 14:44:11 +0000 (12:44 -0200)
commita44dca1717ce2c2381339e21c07d1731a63a7888
tree3d0b3bd26492f9fa1f1f1c1ad838315b266da7c1
parent30ebc5e44d057a1619ad63fe32c8c1670c37c4b8
parenta49f0d1ea3ec94fc7cf33a7c36a16343b74bd565
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
MAINTAINERS
arch/arm/mach-davinci/board-dm644x-evm.c
arch/arm/mach-davinci/dm644x.c
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/soc_camera/mx2_camera.c
drivers/media/platform/soc_camera/mx3_camera.c
drivers/media/platform/soc_camera/omap1_camera.c
drivers/staging/media/dt3155v4l/dt3155v4l.c
drivers/staging/media/lirc/lirc_parallel.c
drivers/staging/media/lirc/lirc_serial.c
drivers/staging/media/lirc/lirc_sir.c