diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 02:57:57 +0200 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-09 02:57:57 +0200 |
commit | ea4e89afedc7fc64078076eacbcffaaa742baf0d (patch) | |
tree | 1e4a14dd1ada2eff8d1cb4d76bf9e337e079845e /drivers/acpi/thermal.c | |
parent | powerpc/windfarm: don't pass const strings to snprintf (diff) | |
parent | powerpc/irq: Make alignment & program interrupt behave the same (diff) | |
download | linux-ea4e89afedc7fc64078076eacbcffaaa742baf0d.tar.xz linux-ea4e89afedc7fc64078076eacbcffaaa742baf0d.zip |
Merge branch 'merge' into next
Diffstat (limited to 'drivers/acpi/thermal.c')
0 files changed, 0 insertions, 0 deletions