summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-081-2/+0
|\
| * Merge branch 'master' into pm-sleepRafael J. Wysocki2011-12-218-47/+106
| |\
| * \ Merge branch 'pm-freezer' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...Rafael J. Wysocki2011-11-231-2/+0
| |\ \
| | * | freezer: don't unnecessarily set PF_NOFREEZE explicitlyTejun Heo2011-11-211-2/+0
* | | | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2012-01-087-19/+19
|\ \ \ \
| * | | | vfs: switch ->show_options() to struct dentry *Al Viro2012-01-061-2/+2
| * | | | vfs: switch ->show_stats to struct dentry *Al Viro2012-01-061-2/+2
| * | | | pohmelfs: propagate umode_tAl Viro2012-01-032-4/+5
| * | | | switch ->is_visible() to returning umode_tAl Viro2012-01-034-8/+8
| * | | | switch ->create() to umode_tAl Viro2012-01-031-1/+1
| * | | | switch vfs_mkdir() and ->mkdir() to umode_tAl Viro2012-01-031-1/+1
| * | | | vfs: fix the stupidity with i_dentry in inode destructorsAl Viro2012-01-031-1/+0
| | |_|/ | |/| |
* | | | Merge branch 'driver-core-next' into Linux 3.2Greg Kroah-Hartman2012-01-0676-1042/+76
|\ \ \ \ | |/ / / |/| | |
| * | | USB: convert drivers/staging/* to use module_usb_driver()Greg Kroah-Hartman2011-11-1813-268/+13
| * | | staging:iio: Use module_spi_driver to register SPI driverLars-Peter Clausen2011-11-1747-567/+47
| * | | staging:iio: Use module_i2c_driver to register I2C driversLars-Peter Clausen2011-11-1716-207/+16
* | | | staging: r8712u: Add new USB IDLarry Finger2011-12-131-0/+1
* | | | staging: tidspbridge: request dmtimer clocks on initOmar Ramirez Luna2011-12-131-3/+12
* | | | staging: tidspbridge: include module.h by defaultOmar Ramirez Luna2011-12-131-4/+0
* | | | Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-12-024-30/+84
|\ \ \ \
| * | | | Staging: comedi: fix integer overflow in do_insnlist_ioctl()Xi Wang2011-11-281-1/+1
| * | | | Revert "Staging: comedi: integer overflow in do_insnlist_ioctl()"Greg Kroah-Hartman2011-11-281-5/+0
| * | | | Staging: comedi: integer overflow in do_insnlist_ioctl()Dan Carpenter2011-11-261-0/+5
| * | | | Staging: comedi: fix signal handling in read and writeFederico Vaga2011-11-261-2/+2
| * | | | Staging: comedi: fix mmap_countFederico Vaga2011-11-261-2/+17
| * | | | staging: comedi: fix oops for USB DAQ devices.Bernd Porr2011-11-261-18/+53
| * | | | staging: comedi: usbduxsigma: Fixed wrong range for the analogue channel.Bernd Porr2011-11-261-3/+4
| * | | | staging:rts_pstor:Complete scanning_done variablewwang2011-11-261-0/+1
| * | | | staging: usbip: bugfix for deadlockBart Westgeest2011-11-261-4/+6
| | |/ / | |/| |
* | | | iio: iio_event_getfd -- fix ev_int build failureAndy Whitcroft2011-11-261-10/+9
|/ / /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2011-11-221-1/+9
|\ \ \
| * | | iio: fix a leak due to improper use of anon_inode_getfd()Al Viro2011-11-211-1/+9
| | |/ | |/|
* | | Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-11-213-8/+9
|\ \ \ | |/ / |/| |
| * | staging: fix more ET131X build errorsRandy Dunlap2011-11-181-1/+2
| * | staging: et131x depends on NETRandy Dunlap2011-11-181-1/+1
| * | staging: slicoss depends on NETRandy Dunlap2011-11-181-1/+1
| * | linux-next: et131x: Fix build error when CONFIG_PM_SLEEP not enabledMark Einon2011-11-181-6/+6
| |/
* | media/staging: fix allyesconfig build errorRandy Dunlap2011-11-172-3/+4
* | STAGING: octeon-ethernet: Fix compile error caused by skb_frag_struct changeDavid Daney2011-11-091-1/+1
|/
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-11-071-3/+3
|\
| * mtd: rename MTD_OOB_* to MTD_OPS_*Brian Norris2011-09-111-3/+3
* | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-0638-1/+39
|\ \
| * | staging: Add module.h to more drivers implicitly using it.Paul Gortmaker2011-10-319-0/+9
| * | staging: Add moduleparam.h to drivers/staging files as requiredPaul Gortmaker2011-10-313-1/+4
| * | staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users.Paul Gortmaker2011-10-3126-0/+26
* | | Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-blockLinus Torvalds2011-11-041-3/+2
|\ \ \
| * \ \ Merge branch 'v3.1-rc10' into for-3.2/coreJens Axboe2011-10-1937-137/+138
| |\ \ \
| * | | | block: remove support for bio remapping from ->make_requestChristoph Hellwig2011-09-121-5/+3
* | | | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-11-04121-12009/+3671
|\ \ \ \ \
| * | | | | staging: Move media drivers to staging/mediaMauro Carvalho Chehab2011-11-0381-20/+46
OpenPOWER on IntegriCloud