Merge branch 'for-next/rtc'
Conflicts:
	arch/mips/dts/jz4755.dtsi
	commands/Makefile
commit 9cce00617bf67a462eabd8c473c423f78414a8e8
2 parents ba465b6 + 642f8fb
@Sascha Hauer Sascha Hauer authored on 7 Aug 2014
Showing 19 changed files
View
arch/arm/configs/versatilepb_defconfig
View
arch/mips/configs/ritmix-rzx50_defconfig
View
arch/mips/dts/jz4755.dtsi
View
commands/Kconfig
View
commands/Makefile
View
commands/hwclock.c 0 → 100644
View
drivers/Kconfig
View
drivers/Makefile
View
drivers/rtc/Kconfig 0 → 100644
View
drivers/rtc/Makefile 0 → 100644
View
drivers/rtc/class.c 0 → 100644
View
drivers/rtc/rtc-ds1307.c 0 → 100644
View
drivers/rtc/rtc-jz4740.c 0 → 100644
View
drivers/rtc/rtc-lib.c 0 → 100644
View
include/linux/bcd.h 0 → 100644
View
include/linux/rtc.h 0 → 100644
View
include/rtc.h
View
lib/Makefile
View
lib/bcd.c 0 → 100644