From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Jun 2014 22:34:55 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew Morton)
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9ee4d7a6538308a7681b638d2f35f2a301420355;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'akpm' (patches from Andrew Morton)

Merge leftovers from Andrew Morton:
 "A few leftovers: ocfs2, gcov, RTC"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  rtc: s5m: consolidate two device type switch statements
  rtc: s5m: add support for S2MPS14 RTC
  rtc: s5m: support different register layout
  rtc: s5m: use shorter time of register update
  rtc: s5m: remove undocumented time init on first boot
  mfd/rtc: sec/s5m: rename SEC* symbols to S5M
  gcov: add support for GCC 4.9
  ocfs2/o2net: incorrect to terminate accepting connections loop upon rejecting an invalid one
---

9ee4d7a6538308a7681b638d2f35f2a301420355