diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-03 23:25:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-03 23:25:14 +0100 |
commit | 225ff868e1eeddcda06e06854e6292b1f8bb2edb (patch) | |
tree | c062683b3d795a60bcb06405e97b3f9e7e591281 /net/sunrpc/backchannel_rqst.c | |
parent | Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/l... (diff) | |
parent | exynos4_tmu_driver_ids should be exynos_tmu_driver_ids. (diff) | |
download | linux-225ff868e1eeddcda06e06854e6292b1f8bb2edb.tar.xz linux-225ff868e1eeddcda06e06854e6292b1f8bb2edb.zip |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management & ACPI update from Zhang Rui,
Ho humm. Normally these things go through Len. But it's just three
small fixes, I guess I can pull directly too.
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
exynos4_tmu_driver_ids should be exynos_tmu_driver_ids.
ACPI video: Ignore errors after _DOD evaluation.
thermal: solve compilation errors in rcar_thermal
Diffstat (limited to 'net/sunrpc/backchannel_rqst.c')
0 files changed, 0 insertions, 0 deletions