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
No related branches found
No related tags found
Showing
- drivers/rtc/Kconfig 2 additions, 2 deletionsdrivers/rtc/Kconfig
- drivers/rtc/rtc-s5m.c 202 additions, 108 deletionsdrivers/rtc/rtc-s5m.c
- fs/ocfs2/cluster/tcp.c 29 additions, 2 deletionsfs/ocfs2/cluster/tcp.c
- include/linux/mfd/samsung/rtc.h 48 additions, 38 deletionsinclude/linux/mfd/samsung/rtc.h
- kernel/gcov/base.c 6 additions, 0 deletionskernel/gcov/base.c
- kernel/gcov/gcc_4_7.c 5 additions, 0 deletionskernel/gcov/gcc_4_7.c
Loading
Please register or sign in to comment