summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/pl2303.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-10-09 07:35:52 +0200
committerLen Brown <len.brown@intel.com>2012-10-09 07:35:52 +0200
commit29b19e250434c6193c8b8e4c34c9c6284dd4f101 (patch)
tree8a1c8e308c9ae964f7fb612e921e10cf4c30ba15 /drivers/usb/serial/pl2303.c
parentidr: rename MAX_LEVEL to MAX_IDR_LEVEL (diff)
parentthermal: Exynos: Fix NULL pointer dereference in exynos_unregister_thermal() (diff)
downloadlinux-29b19e250434c6193c8b8e4c34c9c6284dd4f101.tar.xz
linux-29b19e250434c6193c8b8e4c34c9c6284dd4f101.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal
Conflicts: drivers/staging/omap-thermal/omap-thermal-common. OMAP supplied dummy TC1 and TC2, at the same time that the thermal tree removed them from thermal_zone_device_register() drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c propogate the upstream MAX_IDR_LEVEL re-name to prevent a build failure Previously-fixed-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/usb/serial/pl2303.c')
0 files changed, 0 insertions, 0 deletions