Merge tag 'rtc-max77686-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/abellon...
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Fri, 5 Feb 2016 00:01:49 +0000 (09:01 +0900)
committerKrzysztof Kozlowski <k.kozlowski@samsung.com>
Fri, 5 Feb 2016 00:01:49 +0000 (09:01 +0900)
commit9276599d3b5fbb43f95f92acf1245c3539fce880
treecf922ccfdea2e30fb4e19fcc1b3f8fe354143a59
parent2c658a730083fd84729e30a7c5b3c045347c391a
parentbf035f42344a3e790c2d37ed3ee9005311f98075
Merge tag 'rtc-max77686-4.6' of git://git./linux/kernel/git/abelloni/linux into next/defconfig

Keep RTC functionality on defconfigs for Chromebook Peach intact after
combining the max77802 RTC driver into max77686.