From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Date: Tue, 28 Oct 2014 11:22:17 +0000 (-0200)
Subject: Merge remote-tracking branch 'linus/master' into patchwork
X-Git-Tag: v5.15~16478^2~411
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6d41ba1cb38d3e9575462b12f22b9f0b360bc1d;p=platform%2Fkernel%2Flinux-starfive.git

Merge remote-tracking branch 'linus/master' into patchwork

Merge back media fixes applied upstream.

* linus/master: (457 commits)
  Linux 3.18-rc2
  ARM: dts: imx28-evk: Let i2c0 run at 100kHz
  ARM: i.MX6: Fix "emi" clock name typo
  overlayfs: embed middle into overlay_readdir_data
  overlayfs: embed root into overlay_readdir_data
  overlayfs: make ovl_cache_entry->name an array instead of pointer
  overlayfs: don't hold ->i_mutex over opening the real directory
  arm64: Fix memblock current_limit with 64K pages and 48-bit VA
  sparc64: Implement __get_user_pages_fast().
  sparc64: Fix register corruption in top-most kernel stack frame during boot.
  arm64: ASLR: Don't randomise text when randomise_va_space == 0
  [media] s5p-jpeg: Avoid -Wuninitialized warning in s5p_jpeg_parse_hdr
  [media] s5p-fimc: Only build suspend/resume for PM
  [media] s5p-jpeg: Only build suspend/resume for PM
  [media] Remove references to non-existent PLAT_S5P symbol
  MIPS: SEAD3: Fix I2C device registration.
  [media] videobuf-dma-contig: set vm_pgoff to be zero to pass the sanity check in vm_iomap_memory()
  [media] tw68: remove bogus I2C_ALGOBIT dependency
  kvm: vfio: fix unregister kvm_device_ops of vfio
  KVM: x86: Wrong assertion on paging_tmpl.h
  ...
---

d6d41ba1cb38d3e9575462b12f22b9f0b360bc1d