tree 10b5995adfb2058dd2c941cfd598ffa538c367a8
parent 7fda5d6241be134ad50395d86ce53efb5c9aff41
parent 3cebd7931a6f3007c3eb53942934772cc3b6ee08
author JP Abgrall <jpa@google.com> 1382572396 -0700
committer JP Abgrall <jpa@google.com> 1382572396 -0700

Merge remote-tracking branch 'stable/linux-3.4.y' into android-3.4

* stable/linux-3.4.y: (811 commits)
  Linux 3.4.67
  mm: do not grow the stack vma just because of an overrun on preceding vma
  mm/mmap: check for RLIMIT_AS before unmapping
  drm/radeon: fix hw contexts for SUMO2 asics
  watchdog: ts72xx_wdt: locking bug in ioctl
  parisc: fix interruption handler to respect pagefault_disable()
  KVM: PPC: Book3S HV: Fix typo in saving DSCR
  ext4: fix memory leak in xattr
  vfs: allow O_PATH file descriptors for fstatfs()
  random: run random_int_secret_init() run after all late_initcalls
  ALSA: hda - Add fixup for ASUS N56VZ
  ALSA: snd-usb-usx2y: remove bogus frame checks
  Linux 3.4.66
  ext4: avoid hang when mounting non-journal filesystems with orphan list
  Btrfs: change how we queue blocks for backref checking
  tile: use a more conservative __my_cpu_offset in CONFIG_PREEMPT
  ACPI / IPMI: Fix atomic context requirement of ipmi_msg_handler()
  mm, show_mem: suppress page counts in non-blockable contexts
  staging: comedi: ni_65xx: (bug fix) confine insn_bits to one subdevice
  dmaengine: imx-dma: fix slow path issue in prep_dma_cyclic
  ...

Conflicts:
	kernel/futex.c

Change-Id: Iea4c0bcac37b64b6376f5fbc79a23100484ae402