summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-19 19:56:01 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-19 19:56:01 +0100
commita767835f6dc85277e40fbfe69a29c18817d6c00b (patch)
treeaa22dc73ec92aaf34c9b0fb2c5dbeedad40d6312 /kernel
parentXen: update MAINTAINER info (diff)
parenthwmon: (exynos4_tmu) Fix Kconfig dependency (diff)
downloadlinux-a767835f6dc85277e40fbfe69a29c18817d6c00b.tar.xz
linux-a767835f6dc85277e40fbfe69a29c18817d6c00b.zip
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 ]
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions