From: Linus Torvalds Date: Sat, 19 Nov 2011 18:56:01 +0000 (-0800) Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... X-Git-Tag: firefly_0821_release~3680^2~4076 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a767835f6dc85277e40fbfe69a29c18817d6c00b;p=firefly-linux-kernel-4.4.55.git Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (exynos4_tmu) Fix Kconfig dependency [ Merging code in-flight, just because I can. What timezone should I use? - Linus ] --- a767835f6dc85277e40fbfe69a29c18817d6c00b