summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2011-05-261-1/+1
|\
| * rio: Drop __DATE__ usageMichal Marek2011-04-191-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-253-3/+3
|\ \
| * \ 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
| | | |/
* | | | vmscan: change shrinker API by passing shrink_control structYing Han2011-05-251-1/+4
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2011-05-249-9/+9
|\ \ \ \
| * | | | staging: pcmcia: Convert pcmcia_device_id declarations to constJoe Perches2011-05-069-9/+9
* | | | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-05-2310-957/+781
|\ \ \ \ \
| * | | | | [media] tm6000: fix uninitialized field, change prink to dprintkStefan Ringel2011-05-212-2/+5
| * | | | | [media] tm6000: remove tm6010 sif audio start and stopStefan Ringel2011-05-201-3/+0
| * | | | | [media] tm6000: remove unused exportsStefan Ringel2011-05-201-3/+0
| * | | | | [media] tm6000: add pts loggingStefan Ringel2011-05-201-1/+5
| * | | | | [media] tm6000: change from ioctl to unlocked_ioctlStefan Ringel2011-05-201-4/+4
| * | | | | [media] tm6000: all audio packets must swabStefan Ringel2011-05-201-8/+5
| * | | | | [media] tm6000: remove input selectStefan Ringel2011-05-201-8/+0
| * | | | | [media] tm6000: move from tm6000_set_reg to tm6000_set_reg_maskStefan Ringel2011-05-201-16/+10
| * | | | | [media] tm6000: remove duplicated initStefan Ringel2011-05-201-3/+0
| * | | | | [media] tm6000: remove old tuner paramsStefan Ringel2011-05-201-5/+1
| * | | | | [media] tm6000: remove unused capabilitiesStefan Ringel2011-05-202-10/+0
| * | | | | [media] tm6000: add eepromStefan Ringel2011-05-201-2/+5
| * | | | | [media] tm6000: change input controlStefan Ringel2011-05-204-669/+130
| * | | | | [media] tm6000: vitual input enumsStefan Ringel2011-05-201-43/+57
| * | | | | [media] tm6000: change to virtual inputsStefan Ringel2011-05-203-50/+303
| * | | | | [media] tm6000: add tm6010 audio mode setupStefan Ringel2011-05-203-78/+107
| * | | | | [media] tm6000: add radio capabilitiesStefan Ringel2011-05-203-16/+23
| * | | | | [media] tm6000: add detection based on eeprom nameMauro Carvalho Chehab2011-05-203-32/+105
| * | | | | [media] tm6000: add CARDLISTStefan Ringel2011-05-201-0/+16
| * | | | | [media] tm6000: fix vbuf may be used uninitializedJarod Wilson2011-05-201-2/+2
| * | | | | [media] lirc_sasem: key debug spew off debug modparamJarod Wilson2011-05-201-6/+7
| |/ / / /
* | | | | Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-05-23821-171851/+68282
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_matt mooney2011-05-1911-306/+220
| * | | | staging:iio: Trivial kconfig reorganization and uniformity improvements.Jonathan Cameron2011-05-193-41/+41
| * | | | staging:iio:documenation partial update.Jonathan Cameron2011-05-195-78/+91
| * | | | staging:iio: use pollfunc allocation helpers in remaining drivers.Jonathan Cameron2011-05-199-129/+79
| * | | | staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify eve...Jonathan Cameron2011-05-193-116/+63
| * | | | staging:iio: implement an iio_info structure to take some of the constant ele...Jonathan Cameron2011-05-1961-669/+964
| * | | | staging:iio:meter:ade7758: Use private data space from iio_allocate_deviceMichael Hennerich2011-05-194-70/+62
| * | | | staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.Jonathan Cameron2011-05-193-21/+21
| * | | | staging:iio: ring core cleanups + check if read_last available in lis3l02dqJonathan Cameron2011-05-193-233/+136
| * | | | staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle...Jonathan Cameron2011-05-192-39/+18
| * | | | staging:iio: poll func allocation clean up.Jonathan Cameron2011-05-198-90/+95
| * | | | staging:iio:ad7780 trivial unused header cleanup.Jonathan Cameron2011-05-191-2/+0
| * | | | staging:iio:adc: AD7780: Use private data space from iio_allocate_device + tr...Michael Hennerich2011-05-191-44/+36
| * | | | staging:iio:adc:AD7780: Convert to new channel registration methodMichael Hennerich2011-05-191-62/+51
| * | | | staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()Michael Hennerich2011-05-193-19/+16
| * | | | staging:iio:adc: AD7606: Consitently use indio_devMichael Hennerich2011-05-191-19/+19
| * | | | staging:iio: Rip out helper for software rings.Jonathan Cameron2011-05-195-209/+111
| * | | | staging:iio:adc:AD7298: Use private data space from iio_allocate_deviceMichael Hennerich2011-05-193-44/+41