commit | a767835f6dc85277e40fbfe69a29c18817d6c00b | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 19 10:56:01 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 19 10:56:01 2011 -0800 |
tree | aa22dc73ec92aaf34c9b0fb2c5dbeedad40d6312 | |
parent | d633180c20271d3b7c1fabbccbc7c5b30ad12be4 [diff] | |
parent | 3627902377c4fbdeef4c689fb43b47a86a3ec859 [diff] |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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 ]