tree c037dee441f92e127f5c88e96e537abd5dd41a63
parent dbd1abb209715544bf37ffa0a3798108e140e3ec
parent a0347f20aaacc96a203c9609877ecc77093cbe30
author Linus Torvalds <torvalds@linux-foundation.org> 1402439695 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1402439695 -0700

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