diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-17 17:36:57 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-17 17:36:57 (GMT) |
| commit | 66eb411ea2d8d12eacc0eadcd5004a1736994814 (patch) | |
| tree | 3b0f4ba31f81010eb51ebca8c5c8bff5506a487b /include/linux/pstore.h | |
| parent | 630db0e3d2134b0f7949f912ae2adeec6f765719 (diff) | |
| parent | e13cef8ded69e469b56e150e30619693b91b1864 (diff) | |
| download | linux-fsl-qoriq-66eb411ea2d8d12eacc0eadcd5004a1736994814.tar.xz | |
Merge tag 'char-misc-3.12-rc6' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'include/linux/pstore.h')
0 files changed, 0 insertions, 0 deletions