From: Linus Torvalds Date: Fri, 17 Aug 2012 17:15:57 +0000 (-0700) Subject: Merge tag 'char-misc-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... X-Git-Tag: v3.6-rc3~40 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7d45fedf92b351500af99d03004e59531a3d070;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge tag 'char-misc-3.6-rc3' of git://git./linux/kernel/git/gregkh/char-misc Pull Char / Misc driver fixes from Greg Kroah-Hartman: "Here are some small misc and w1 driver fixes for 3.6-rc3. Nothing major, just some some bugfixes and a new device id for a w1 driver. Signed-off-by: Greg Kroah-Hartman " * tag 'char-misc-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: 1-Wire: Add support for the maxim ds1825 temperature sensor ti-st: Fix check for pdata->chip_awake function pointer mei: add mei_quirk_probe function mei: fix device stall after wd is stopped --- d7d45fedf92b351500af99d03004e59531a3d070