From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Oct 2013 17:36:57 +0000 (-0700)
Subject: Merge tag 'char-misc-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: v3.12-rc6~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=66eb411ea2d8d12eacc0eadcd5004a1736994814;p=linux-2.6-block.git

Merge tag 'char-misc-3.12-rc6' of git://git./linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH:
 "Here are some small iio and w1 driver fixes for 3.12-rc6.

  There is also a hyper-v fix in here, which turned out to be incorrect,
  so it was reverted.  That will probably have to wait unto 3.13-rc1 to
  get accepted as it's still being discussed"

* tag 'char-misc-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Revert "Drivers: hv: vmbus: Fix a bug in channel rescind code"
  Drivers: hv: vmbus: Fix a bug in channel rescind code
  iio:buffer: Free active scan mask in iio_disable_all_buffers()
  iio: frequency: adf4350: add missing clk_disable_unprepare() on error in adf4350_probe()
  w1 - call request_module with w1 master mutex unlocked
  w1 - fix fops in w1_bus_notify
---

66eb411ea2d8d12eacc0eadcd5004a1736994814