summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-11-294-18/+19
|\
| * staging: r8188eu: Add new device ID for DLink GO-USB-N150Larry Finger2014-11-271-0/+1
| * staging: r8188eu: Fix scheduling while atomic error introduced in commit fadb...Larry Finger2014-11-263-18/+18
* | Merge tag 'master-2014-11-20' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2014-11-211-2/+5
|\ \
| * | mac80211: allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDRJohannes Berg2014-11-191-2/+5
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-11-149-82/+51
|\ \ \ | |/ / |/| / | |/
| * Merge tag 'iio-fixes-for-3.18b' of git://git.kernel.org/pub/scm/linux/kernel/...Greg Kroah-Hartman2014-11-053-50/+13
| |\
| | * staging:iio:ade7758: Remove "raw" from channel nameLars-Peter Clausen2014-11-051-15/+9
| | * staging:iio:ade7758: Fix check if channels are enabled in prenableLars-Peter Clausen2014-11-051-1/+1
| | * staging:iio:ade7758: Fix NULL pointer deref when enabling bufferLars-Peter Clausen2014-11-053-34/+3
| | * iio: adc: mxs-lradc: Disable the clock on probe failureFabio Estevam2014-11-051-4/+8
| | * staging:iio:ad5933: Drop "raw" from channel namesLars-Peter Clausen2014-11-051-2/+2
| | * staging:iio:ad5933: Fix NULL pointer deref when enabling bufferLars-Peter Clausen2014-11-051-7/+4
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-11-021-5/+8
| |\ \
| | * | staging: android: logger: Fix log corruption regressionDaniel Thompson2014-10-281-5/+8
| * | | staging: comedi: fix memory leak / bad pointer freeing for chanlistIan Abbott2014-10-291-0/+3
| * | | staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependantsIan Abbott2014-10-291-1/+0
| * | | staging: comedi: widen subdevice number argument in ioctl handlersIan Abbott2014-10-291-4/+4
| * | | Merge tag 'iio-fixes-for-3.18a' of git://git.kernel.org/pub/scm/linux/kernel/...Greg Kroah-Hartman2014-10-252-13/+14
| |\ \ \ | | |_|/ | |/| |
| | * | iio: adc: mxs-lradc: Disable the clock on probe failureFabio Estevam2014-10-091-4/+8
| | * | staging:iio:ad5933: Drop "raw" from channel namesLars-Peter Clausen2014-09-271-2/+2
| | * | staging:iio:ad5933: Fix NULL pointer deref when enabling bufferLars-Peter Clausen2014-09-271-7/+4
| * | | staging: rtl8723au: Fix alignment of mac_addr for ether_addr_copy() usageJes Sorensen2014-10-201-1/+1
| * | | drivers/staging/comedi/Kconfig: Let COMEDI_II_PCI20KC depend on HAS_IOMEMChen Gang2014-10-201-0/+1
| * | | staging: comedi: (regression) channel list must be set for COMEDI_CMD ioctlIan Abbott2014-10-201-8/+7
| | |/ | |/|
* | | Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm...John W. Linville2014-11-041-1/+3
|\ \ \ | |/ / |/| |
| * | cfg80211: Convert del_station() callback to use a param structJouni Malinen2014-10-201-1/+3
* | | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2014-10-141-0/+1
|\ \ \
| * \ \ drm: backmerge tag 'v3.17-rc5' into drm-nextDave Airlie2014-09-1666-11364/+41
| |\ \ \
| * \ \ \ Merge tag 'ipu-3.18' of git://git.pengutronix.de/git/pza/linux into drm-nextDave Airlie2014-09-101-10/+6
| |\ \ \ \
| * | | | | drm: add driver->set_busid() callbackDavid Herrmann2014-09-101-0/+1
* | | | | | staging: rtl8192u: use %*pEn to escape bufferAndy Shevchenko2014-10-141-13/+1
* | | | | | staging: rtl8192e: use %*pEn to escape bufferAndy Shevchenko2014-10-141-13/+1
* | | | | | staging: wlan-ng: use %*pEhp to print SNAndy Shevchenko2014-10-141-26/+2
* | | | | | staging: r8188eu: replace strnicmp with strncasecmpRasmus Villemoes2014-10-141-1/+1
* | | | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2014-10-133-5/+0
|\ \ \ \ \ \
| * | | | | | sched, cleanup, treewide: Remove set_current_state(TASK_RUNNING) after schedu...Kirill Tkhai2014-09-193-5/+0
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-10-134-104/+31
|\ \ \ \ \ \ \
| * | | | | | | android: ->f_op is never NULLAl Viro2014-10-091-1/+1
| * | | | | | | switch logger to ->write_iter()Al Viro2014-10-091-77/+26
| * | | | | | | vme: don't open-code fixed_size_llseek()Al Viro2014-10-091-25/+3
| * | | | | | | ashmem: use vfs_llseek()Al Viro2014-10-091-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2014-10-1022-3379/+5
|\ \ \ \ \ \ \
| * | | | | | | [media] staging: lirc: freeing ERR_PTRsDan Carpenter2014-09-232-0/+2
| * | | | | | | Merge remote-tracking branch 'linus/master' into patchworkMauro Carvalho Chehab2014-09-2168-11365/+45
| |\| | | | | |
| * | | | | | | [media] be sure that HAS_DMA is enabled for vb2-dma-contigMauro Carvalho Chehab2014-08-263-0/+3
| * | | | | | | Revert "[media] staging: omap4iss: copy paste error in iss_get_clocks"Mauro Carvalho Chehab2014-08-261-1/+0
| * | | | | | | [media] staging: omap4iss: copy paste error in iss_get_clocksVitaly Osipov2014-08-211-0/+1
| * | | | | | | [media] as102: promote it out of stagingMauro Carvalho Chehab2014-08-2117-3373/+0
| * | | | | | | [media] staging: media: as102: replace custom dprintk() with dev_dbg()Martin Kepplinger2014-08-214-47/+41
| | |_|/ / / / | |/| | | | |