summaryrefslogtreecommitdiffstats
path: root/drivers/staging/Makefile
Commit message (Expand)AuthorAgeFilesLines
* cs5535: deprecate older cs5535_gpio driverAndres Salomon2011-01-131-0/+1
* Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-01-101-2/+3
|\
| * Staging: batman-adv: Remove batman-adv from stagingSven Eckelmann2010-12-161-1/+0
| * staging: adis16255 delete driverMatthias Brugger2010-12-021-1/+0
| * Staging: sep: Introduce sep driverMark Allyn2010-11-191-0/+1
| * Staging: add Synaptics RMI4 touchpad driver supportNaveen Kumar Gaddipati2010-11-091-0/+1
| * Staging: add Synaptics TM1217 Touchscreen Controller driverRamesh Agarwal2010-11-091-0/+1
* | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-01-061-2/+3
|\ \
| * | [media] dabusb: Move it to staging to be deprecatedMauro Carvalho Chehab2010-12-291-0/+1
| * | [media] cpia, stradis: remove deprecated V4L1 driversHans Verkuil2010-12-291-2/+0
| * | [media] se401: deprecate driver, move to stagingHans Verkuil2010-12-291-0/+1
| * | [media] usbvideo: deprecate the vicam driverHans Verkuil2010-12-291-0/+1
| |/
* | fbdev: move udlfb out of staging.Paul Mundt2010-11-161-1/+0
|/
* Staging: dream: remove dream driver and arch from treeGreg Kroah-Hartman2010-10-291-1/+0
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds2010-10-281-2/+13
|\
| * Merge 'staging-next' to Linus's treeGreg Kroah-Hartman2010-10-281-2/+13
| |\
| | * Staging: add speakup to the staging directoryWilliam Hubbs2010-10-071-0/+1
| | * Staging: sst: Intel SST audio driverVinod Koul2010-10-051-0/+1
| | * smbfs: move to drivers/stagingArnd Bergmann2010-10-051-0/+1
| | * autofs3: move to drivers/stagingArnd Bergmann2010-10-051-0/+1
| | * staging: remove the Atheros otus vendor driverLuis R. Rodriguez2010-10-011-1/+0
| | * staging: olpc_dcon: add OLPC display controller (DCON) supportAndres Salomon2010-09-291-0/+1
| | * Staging: Add support for Flarion OFDM usb and pcmcia devices.Marek Belisko2010-09-221-0/+1
| | * Staging: fix Makefile so broadcom driver will actually build.Greg Kroah-Hartman2010-09-081-1/+1
| | * Staging: Add initial release of brcm80211 - Broadcom 802.11n wireless LAN dri...Henry Ptasinski2010-09-081-0/+1
| | * staging: Beeceem USB Wimax driverStephen Hemminger2010-09-081-0/+1
| | * Staging: add USB ENE card reader driverAl Cho2010-09-081-0/+1
| | * staging: add ath6kl driver for AR6003 chipVipin Mehta2010-09-021-0/+1
| | * Staging: mrst-touchscreen: Fix wrong Makefile configAlek Du2010-08-311-1/+1
| | * Staging: Add SBE 2T3E3 WAN driverKrzysztof Halasa2010-08-301-0/+1
| | * Staging: add West Bridge Astoria DriverDavid Cross2010-08-301-0/+1
| | * Staging: delete rtl8192su driverGreg Kroah-Hartman2010-08-301-1/+0
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Larry Finger2010-08-261-1/+0
| | |\
| | * | staging: r8712u: Add the new driver to the mainline kernelLarry Finger2010-08-201-0/+1
* | | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-10-281-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | V4L/DVB: Deprecate stradis driverMauro Carvalho Chehab2010-10-211-0/+1
| * | | V4L/DVB: Deprecate cpia driver (used for parallel port webcams)Mauro Carvalho Chehab2010-10-211-0/+1
| | |/ | |/|
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-10-251-1/+0
|\ \ \ | |/ / |/| |
| * | Merge branch 'mrst-touchscreen' into nextDmitry Torokhov2010-09-051-1/+0
| |\ \ | | |/ | |/|
| | * Input: mrst-touchscreen - move out of stagingDmitry Torokhov2010-09-011-1/+0
| | * Staging: mrst_touchscreen - clean up input sideAlan Cox2010-09-011-1/+1
* | | Staging: sep: remove driverGreg Kroah-Hartman2010-08-231-1/+0
|/ /
* | Staging: Merge staging-next into Linus's treeGreg Kroah-Hartman2010-08-051-2/+6
|\ \
| * | Staging: dt3155: remove the driverGreg Kroah-Hartman2010-08-021-1/+0
| * | Staging: quickstart: add the quickstart driver to the buildGreg Kroah-Hartman2010-07-081-0/+1
| * | staging: ti dspbridge: enable driver buildingOmar Ramirez Luna2010-06-241-0/+1
| * | Staging: solo6x10: Add kconfig/kbuild fairy dust for solo6x10Ben Collins2010-06-221-0/+1
| * | Staging: Rename ramzswap files to zramNitin Gupta2010-06-181-1/+1
| * | Staging: easycap: add easycap driverR.M. Thomas2010-06-181-0/+1
| * | Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into workGreg Kroah-Hartman2010-06-181-0/+1
| |\ \ | | |/ | |/|
OpenPOWER on IntegriCloud