Merge 'android-3.18.107' (bb08153d) into 'msm-3.18'

Merge with google common 'android-3.18.107' at
bb08153d into 'msm-3.18'

* quic/tmp-bb08153d:
  ANDROID: staging: 'vsoc' driver build fix.
  BACKPORT: of: ioapic_irq_domain_ops can be static
  Linux 3.18.107
  cdrom: information leak in cdrom_ioctl_media_changed()
  scsi: mptsas: Disable WRITE SAME
  ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy
  llc: delete timers synchronously in llc_sk_free()
  net: af_packet: fix race in PACKET_{R|T}X_RING
  tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets
  packet: fix bitfield update race
  llc: fix NULL pointer deref for SOCK_ZAPPED
  llc: hold llc_sap before release_sock()
  pppoe: check sockaddr length in pppoe_connect()
  team: fix netconsole setup over team
  team: avoid adding twice the same option to the event list
  tcp: don't read out-of-bounds opsize
  l2tp: check sockaddr length in pppol2tp_connect()
  KEYS: DNS: limit the length of option strings
  bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave
  jbd2: fix use after free in kjournald2()
  mm/filemap.c: fix NULL pointer in page_cache_tree_insert()
  perf: Return proper values for user stack errors
  ext4: don't update checksum of new initialized bitmaps
  ext4: bugfix for mmaped pages in mpage_release_unused_pages()
  ext4: fix deadlock between inline_data and ext4_expand_extra_isize_ea()
  x86/tsc: Prevent 32bit truncation in calc_hpet_ref()
  cifs: do not allow creating sockets except with SMB1 posix exensions
  ANDROID: Add build server config for cuttlefish.
  ANDROID: Add defconfig for cuttlefish.
  FROMLIST: staging: Android: Add 'vsoc' driver for cuttlefish.
  UPSTREAM: timer: Export destroy_hrtimer_on_stack()
  UPSTREAM: mac80211_hwsim: Fix memory leak in hwsim_new_radio_nl()
  UPSTREAM: mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length
  UPSTREAM: mac80211_hwsim: support any address in userspace
  UPSTREAM: mac80211_hwsim: fix PS debugfs file locking
  UPSTREAM: mac80211-hwsim: remove unnecessary hwname check
  UPSTREAM: mac80211-hwsim: hwname is always known so use the value from wiphy
  UPSTREAM: mac80211-hwsim: Provide multicast event for HWSIM_CMD_NEW_RADIO
  UPSTREAM: mac80211-hwsim: Provide multicast event for HWSIM_CMD_DEL_RADIO
  BACKPORT: mac80211-hwsim: add missing policy entries
  UPSTREAM: mac80211-hwsim: Rename CREATE and DESTROY radio to NEW and DEL radio
  UPSTREAM: mac80211-hwsim: support creating wiphy w/out creating wlanX
  UPSTREAM: mac80211: support creating wiphy w/out creating wlanX
  UPSTREAM: mac80211-hwsim: support creating radios with specific name
  BACKPORT: mac80211: allow creating wiphy devices with suggested name
  UPSTREAM: cfg80211: support creating wiphy with suggested name
  UPSTREAM: mac80211-hwsim: support destroying radio by name
  UPSTREAM: mac80211-hwsim: Add support for HWSIM_ATTR_DESTROY_RADIO_ON_CLOSE
  UPSTREAM: mac80211_hwsim: fix memory leak on netlink TX failure
  UPSTREAM: of: add HAS_IOMEM depends to OF_ADDRESS
  BACKPORT: of: make unittest select OF_EARLY_FLATTREE instead of depend on it
  BACKPORT: of: make CONFIG_OF user selectable
  UPSTREAM: x86/apic: Fix the devicetree build in certain configs
  ANDROID: sdcardfs: Set s_root to NULL after putting
  ANDROID: sdcardfs: d_make_root calls iput
  ANDROID: sdcardfs: Check for private data earlier

Conflicts:
	drivers/of/Kconfig
	drivers/staging/android/Kconfig
	drivers/staging/android/Makefile

Change-Id: Ie7909889f4d20b1101062b98b61ba8a0c789422e
Signed-off-by: Chetan C R <cravin@codeaurora.org>