summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-08-202-2/+2
|\
| * USB: winbond: remove __devinit* from the struct usb_device_id tableGreg Kroah-Hartman2012-08-171-1/+1
| * USB: vt6656: remove __devinit* from the struct usb_device_id tableGreg Kroah-Hartman2012-08-171-1/+1
* | Merge tag 'v3.6-rc1-iio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g...Greg Kroah-Hartman2012-08-164-66/+93
|\ \
| * | staging:iio:ad7780: Mark channels as unsignedLars-Peter Clausen2012-08-161-4/+6
| * | staging:iio:ad7192: Report offset and scale for temperature channelLars-Peter Clausen2012-08-161-14/+12
| * | staging:iio:ad7192: Report channel offsetLars-Peter Clausen2012-08-161-4/+10
| * | staging:iio:ad7192: Mark channels as unsignedLars-Peter Clausen2012-08-161-3/+3
| * | staging:iio:ad7192: Fix setting ACXLars-Peter Clausen2012-08-161-1/+1
| * | staging:iio:ad7192: Add missing break in switch statementLars-Peter Clausen2012-08-161-1/+1
| * | staging:iio:ad7793: Fix internal reference valueLars-Peter Clausen2012-08-161-1/+1
| * | staging:iio:ad7793: Follow new IIO naming specLars-Peter Clausen2012-08-161-2/+3
| * | staging:iio:ad7793: Fix temperature scale and offsetLars-Peter Clausen2012-08-161-11/+18
| * | staging:iio:ad7793: Report channel offsetLars-Peter Clausen2012-08-161-13/+26
| * | staging:iio:ad7793: Mark channels as unsignedLars-Peter Clausen2012-08-161-12/+12
| * | staging:iio:ad7793: Add missing break in switch statementLars-Peter Clausen2012-08-161-1/+1
| * | iio: staging: ad7298_ring: Fix maybe-uninitialized warningMichael Hennerich2012-08-161-1/+1
| |/
* | staging: comedi: usbduxfast: Declare MODULE_FIRMWARE usageTim Gardner2012-08-161-1/+3
* | staging: comedi: usbdux: Declare MODULE_FIRMWARE usageTim Gardner2012-08-161-1/+3
* | staging: comedi: usbduxsigma: Declare MODULE_FIRMWARE usageTim Gardner2012-08-161-1/+3
* | staging: csr: add INET dependancyGreg Kroah-Hartman2012-08-141-1/+1
* | staging: comedi: Fix reversed test in comedi_device_attach()Ian Abbott2012-08-141-1/+1
* | staging: comedi: rtd520: ioremap'ed addresses are resource_size_tH Hartley Sweeten2012-08-071-16/+10
* | staging: comedi: dt3000: ioremap'ed addresses are resource_size_tH Hartley Sweeten2012-08-071-2/+4
* | staging: comedi: daqboard2000: ioremap'ed addresses are resource_size_tH Hartley Sweeten2012-08-071-7/+7
* | staging: comedi: daqboard2000: add back subsystem_device checkH Hartley Sweeten2012-08-071-1/+2
* | staging: comedi: remove pci_is_enabled() testsH Hartley Sweeten2012-08-073-7/+0
|/
* Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpcLinus Torvalds2012-08-021-0/+1
|\
| * drivers: OLPC: update various drivers to include olpc-ec.hAndres Salomon2012-07-311-0/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-08-013-43/+17
|\ \
| * | slightly reduce lossage in gdm72xxAl Viro2012-07-292-17/+12
| * | slightly reduce idiocy in drivers/staging/bcm/Misc.cAl Viro2012-07-291-26/+5
* | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-07-314-27/+4
|\ \ \ | |_|/ |/| |
| * | [media] staging/media/solo6x10: use module_pci_driver macroDevendra Naga2012-07-301-12/+1
| * | [media] staging/media/dt3155v4l: use module_pci_driver macroDevendra Naga2012-07-301-14/+1
| * | [media] lirc: fix non-ANSI function declaration warningEmil Goode2012-07-301-1/+1
| * | [media] drivers/staging/media/easycap/easycap_main.c: add missing usb_free_urbJulia Lawall2012-07-301-0/+1
* | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-07-303-4/+60
|\| |
| * | [media] staging: solo6x10: Fix TODO file with proper maintainerEzequiel GarcĂ­a2012-07-051-1/+1
| * | Merge branch 'v4l_for_linus' into staging/for_v3.6Mauro Carvalho Chehab2012-06-271-0/+6
| |\ \
| * | | [media] staging: solo6x10: fix | vs &Dan Carpenter2012-06-181-1/+1
| * | | [media] lirc_sir: make device registration workJarod Wilson2012-06-181-2/+58
* | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-07-303-67/+117
|\ \ \ \
| * | | | staging: octeon_ethernet: Convert to use device tree.David Daney2012-07-233-67/+117
| | |_|/ | |/| |
* | | | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2012-07-262-2/+2
|\ \ \ \
| * | | | Merge tag 'v3.5-rc7' into drm-nextDave Airlie2012-07-201-0/+6
| |\| | |
| * | | | drm: Make the .mode_fixup() operations mode argument a const pointerLaurent Pinchart2012-07-192-2/+2
* | | | | Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-07-26604-29427/+114545
|\ \ \ \ \
| * | | | | staging: csr: delete a bunch of unused library functionsGreg Kroah-Hartman2012-07-206-616/+1
| * | | | | staging: csr: remove csr_utf16.cGreg Kroah-Hartman2012-07-2010-1155/+28