summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 09:53:39 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 09:53:39 -0800
commitecc3599396a4d7672355109f263b76a2df90f3d1 (patch)
treef8aeaca5e05a625997094560f32d4e6b162142bc /drivers/usb
parentd1c3ed669a2d452cacfb48c2d171a1f364dae2ed (diff)
parente07c6d170ccec9e7377a43a2999b87b860c642e9 (diff)
Merge tag 'iio-for-3.9a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan says: First round of IIO new stuff and cleanups for 3.9 Here we have: * RTC driver for the hid-sensor hubs. This is routed through here with agreement of Jiri Kosina and Andrew Morton. * Some small patches doing dead code removal and fixing some comments. * max1363 - move to the triggered_buffer helpers (basically duplicate code removal). * lp8788 - parent device change from the i2c device to the intermediate mfd. So the bulk of what we have is actually outside the IIO tree but the RTC driver in question is dependent on some patches that directly effect IIO so I am routing it through IIO with the agreement of the relevant maintainers (Andrew is acting as maintainer of RTC at the moment). The majority of HID-sensor related code is in IIO and it now crosses 3 subsystems so it was going to be a bit awkward whatever route it took.
Diffstat (limited to 'drivers/usb')
0 files changed, 0 insertions, 0 deletions