Merge google common 'android-3.18' into 'msm-3.18'

Merge with google common 'android-3.18' at
c0f6f0e4 into 'msm-3.18'

* quic/tmp-c0f6f0e4:
  Linux 3.18.100
  fixup: sctp: verify size of a new chunk in _sctp_make_chunk()
  serial: 8250_pci: Add Brainboxes UC-260 4 port serial device
  staging: android: ashmem: Fix lockdep issue during llseek
  uas: fix comparison for error code
  tty/serial: atmel: add new version check for usart
  serial: sh-sci: prevent lockup on full TTY buffers
  x86: Treat R_X86_64_PLT32 as R_X86_64_PC32
  x86/module: Detect and skip invalid relocations
  scripts: recordmcount: break hardlinks
  ubi: Fix race condition between ubi volume creation and udev
  netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pkt
  netfilter: bridge: ebt_among: add missing match size checks
  netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets
  netfilter: IDLETIMER: be syzkaller friendly
  netfilter: nat: cope with negative port range
  netfilter: x_tables: fix missing timer initialization in xt_LED
  ALSA: seq: More protection for concurrent write and ioctl races
  ALSA: seq: Don't allow resizing pool in use
  x86/MCE: Serialize sysfs changes
  Input: matrix_keypad - fix race when disabling interrupts
  MIPS: BMIPS: Do not mask IPIs during suspend
  scsi: qla2xxx: Fix NULL pointer crash due to active timer for ABTS
  FROMLIST: f2fs: don't put dentry page in pagecache into highmem
  timekeeping: Remove unused variable from tk_update_ktime_data
  Linux 3.18.99
  dm io: fix duplicate bio completion due to missing ref count
  fib_semantics: Don't match route with mismatching tclassid
  net: ipv4: don't allow setting net.ipv4.route.min_pmtu below 68
  sctp: verify size of a new chunk in _sctp_make_chunk()
  s390/qeth: fix IPA command submission race
  s390/qeth: fix SETIP command handling
  sctp: fix dst refcnt leak in sctp_v6_get_dst()
  udplite: fix partial checksum initialization
  ppp: prevent unregistered channels from connecting to PPP units
  netlink: ensure to loop over all netns in genlmsg_multicast_allns()
  net: fix race on decreasing number of TX queues
  ipv6 sit: work around bogus gcc-8 -Wrestrict warning
  hdlc_ppp: carrier detect ok, don't turn off negotiation
  bridge: check brport attr show in brport_show
  leds: do not overflow sysfs buffer in led_trigger_show
  net: fec: introduce fec_ptp_stop and use in probe fail path
  ARM: mvebu: Fix broken PL310_ERRATA_753970 selects
  cpufreq: s3c24xx: Fix broken s3c_cpufreq_init()
  ALSA: usb-audio: Add a quirck for B&W PX headphones
  tpm_i2c_nuvoton: fix potential buffer overruns caused by bit glitches on the bus
  tpm_i2c_infineon: fix potential buffer overruns caused by bit glitches on the bus

USB related changes were ignored as per the feedback
from the USB team.

Conflicts:
	drivers/usb/core/quirks.c
	drivers/usb/storage/uas.c
	include/linux/usb/quirks.h

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