summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2011-05-253-4/+4
|\
| * Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next...John W. Linville2011-05-243-4/+4
| |\
| | * cfg80211: Use consistent BSS matching between scan and smeJouni Malinen2011-05-193-4/+4
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2011-05-232-1/+4
|\ \ \ | |/ / |/| |
| * | Merge branch 'topic/asoc' into for-linusTakashi Iwai2011-05-222-1/+4
| |\ \
| | * \ ASoC: Merge branch 'for-2.6.39' into for-2.6.40Mark Brown2011-04-18352-2850/+1084
| | |\ \
| | * | | sst: fix compile errorLu Guanqun2011-04-081-0/+3
| | * | | sst: make register_sst_card more self-containedLu Guanqun2011-04-062-1/+1
| | | |/ | | |/|
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-201-2/+1
|\ \ \ \
| * | | | Staging: convert hv network driver to hw_featuresMichał Mirosław2011-04-201-2/+1
| | |_|/ | |/| |
* | | | sanitize <linux/prefetch.h> usageLinus Torvalds2011-05-201-0/+1
| |/ / |/| |
* | | Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-05-0417-23/+24
|\ \ \
| * | | staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.cHarry Wei2011-05-031-1/+1
| * | | staging: intel_sst: intelmid needs delay.hRandy Dunlap2011-04-252-0/+2
| * | | staging: solo6x10: add select SND_PCM to fix build errorPeter Foley2011-04-251-0/+1
| * | | staging: usbip: vhci: fix oops on subsequent attachMax Vozeler2011-04-252-8/+8
| * | | staging: ft1000: Remove unnecessary EXPORT_SYMBOLsJeff Mahoney2011-04-252-7/+0
| * | | staging: rts_pstor: use #ifdef instead of #ifJeff Mahoney2011-04-254-6/+6
| * | | staging: rts_pstor: Add <linux/vmalloc.h>Jeff Mahoney2011-04-254-0/+4
| * | | staging: gma500: Depend on X86Jeff Mahoney2011-04-251-1/+1
| * | | staging: olpc: Add <linux/delay.h>Jeff Mahoney2011-04-251-0/+1
* | | | Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds2011-05-041-1/+1
|\ \ \ \
| * | | | USB: fix regression in usbip by setting has_tt flagAlan Stern2011-05-021-1/+1
| |/ / /
* / / / Revert wrong fixes for common misspellingsLucas De Marchi2011-04-265-5/+5
|/ / /
* | | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg...Linus Torvalds2011-04-126-862/+0
|\ \ \ | |/ / |/| |
| * | staging: samsung-laptop has moved to platform/x86Michal Marek2011-04-126-862/+0
| |/
* | Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-04-0740-2092/+324
|\ \
| * | staging: usbip: bugfix for isochronous packets and optimizationArjan Mels2011-04-064-14/+122
| * | staging: usbip: bugfix add number of packets for isochronous framesArjan Mels2011-04-061-1/+6
| * | staging: usbip: bugfixes related to kthread conversionArjan Mels2011-04-061-25/+15
| * | staging: usbip: fix shutdown problems.Arjan Mels2011-04-061-2/+4
| * | staging: hv: Fix GARP not sent after Quick MigrationHaiyang Zhang2011-04-061-0/+24
| * | staging: IIO: IMU: ADIS16400: Avoid using printk facility directlyMichael Hennerich2011-04-051-2/+4
| * | staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision nu...Michael Hennerich2011-04-051-1/+1
| * | staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed...Michael Hennerich2011-04-051-3/+7
| * | staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offsetMichael Hennerich2011-04-051-4/+4
| * | staging: IIO: IMU: ADIS16400: Add delay after self testMichael Hennerich2011-04-052-2/+3
| * | staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behaviorMichael Hennerich2011-04-052-4/+0
| * | staging/rtl81*: build as loadable modules onlyRandy Dunlap2011-04-043-0/+3
| * | staging: brcm80211: removed 'is_amsdu causing toss' log spamRoland Vossen2011-04-041-3/+1
| * | staging: brcm80211: fix for 'Short CCK' log spamRoland Vossen2011-04-041-2/+1
| * | staging: brcm80211: fix for 'AC_BE txop..' logs spammed problemRoland Vossen2011-04-041-1/+1
| * | staging: memrar: remove driver from treeGreg Kroah-Hartman2011-04-0410-1914/+0
| * | staging: sep: remove last memrar remnantsAlan Cox2011-04-041-13/+2
| * | staging: fix hv_mouse build, needs delay.hRandy Dunlap2011-04-041-0/+1
| * | staging: fix olpc_dcon build errorsSascha Silbe2011-04-042-1/+2
| * | staging: sm7xx: fixed definesJavier M. Mellid2011-04-041-4/+2
| * | Staging: westbridge/astoria: unlock on error pathDan Carpenter2011-04-041-0/+1
| * | staging: ft1000-pcmcia: Fix ft1000_dnld() to work also on 64bit architectures.pixo2011-04-041-39/+39
| * | staging: rts_pstor: set lun_mode in a different placewwang2011-04-041-6/+5