summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6Linus Torvalds2011-10-301-18/+7
|\
| * Merge commit 'v3.1-rc9' into fbdev-nextFlorian Tobias Schandinat2011-10-158-8/+13
| |\
| * \ Merge branch 'pan-fixes' of git://linuxtv.org/pinchartl/fbdev into fbdev-nextFlorian Tobias Schandinat2011-08-241-16/+6
| |\ \
| | * | staging: xgifb: use display information in info not in var for panningLaurent Pinchart2011-08-191-16/+6
* | | | Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2011-10-281-2/+0
|\ \ \ \
| * \ \ \ Merge tag 'v3.1-rc10' into drm-core-nextDave Airlie2011-10-183-3/+6
| |\ \ \ \
| * | | | | vmwgfx: Take the driver out of stagingThomas Hellstrom2011-10-111-2/+0
* | | | | | Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-10-282-102/+0
|\ \ \ \ \ \
| * | | | | | x86: Hyper-V: Integrate the clocksource with Hyper-V detection codeK. Y. Srinivasan2011-09-082-102/+1
| |/ / / / /
* | | | | | Remove stale "depends on NETDEV_1000"in staging driversLinus Torvalds2011-10-262-2/+2
* | | | | | Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-10-26716-185650/+103282
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'staging-next' into Linux 3.1Greg Kroah-Hartman2011-10-25825-235651/+103282
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | staging: et131x: Remove redundant check and return statementMark Einon2011-10-231-3/+0
| | * | | | | staging: et131x: Mainly whitespace changes to appease checkpatchMark Einon2011-10-231-35/+46
| | * | | | | staging: et131x: Remove last of the forward declarationsMark Einon2011-10-231-134/+128
| | * | | | | staging: et131x: Remove even more forward declarationsMark Einon2011-10-231-202/+193
| | * | | | | staging: et131x: Remove yet more forward declarationsMark Einon2011-10-231-220/+214
| | * | | | | staging: et131x: Remove more forward declarationsMark Einon2011-10-231-254/+251
| | * | | | | staging: et131x: Remove forward declaration of et131x_adapter_setupMark Einon2011-10-231-223/+222
| | * | | | | staging: et131x: Remove some forward declarationsMark Einon2011-10-231-66/+60
| | * | | | | staging: et131x: Remove unused rx_ring.recv_packet_poolMark Einon2011-10-231-2/+0
| | * | | | | staging: et131x: Remove call to find pci pm capabilityMark Einon2011-10-231-14/+0
| | * | | | | staging: et131x: Remove redundant et131x_reset_recv() callMark Einon2011-10-231-18/+0
| | * | | | | staging: et131x: Remove unused rx_ring.recv_buffer_poolMark Einon2011-10-231-6/+0
| | * | | | | Staging: bcm: Fix three initialization errors in InterfaceDld.cKevin McKinney2011-10-231-4/+5
| | * | | | | Staging: bcm: Fix coding style issues in InterfaceDld.cKevin McKinney2011-10-231-213/+161
| | * | | | | staging:iio:dac: Add AD5360 driverLars-Peter Clausen2011-10-233-0/+593
| | * | | | | staging:iio:trigger:bfin-timer: Fix compile errorLars-Peter Clausen2011-10-231-1/+1
| | * | | | | Staging: vt6655: add some range checks before memcpy()Dan Carpenter2011-10-231-0/+6
| | * | | | | Staging: vt6655: whitespace fixes to iotcl.cDan Carpenter2011-10-231-596/+491
| | * | | | | Staging: vt6656: add some range checks before memcpy()Dan Carpenter2011-10-231-0/+6
| | * | | | | Staging: vt6656: whitespace cleanups in ioctl.cDan Carpenter2011-10-231-552/+483
| | * | | | | staging: et131x: Remove unused definesMark Einon2011-10-231-11/+0
| | * | | | | staging: et131x: Convert rest of pci memory management to dma apiMark Einon2011-10-231-28/+28
| | * | | | | staging: et131x: on transmit, stop the queue if the next packet will failMark Einon2011-10-232-8/+6
| | * | | | | staging: et131x: Tidy up PCI device table definitionMark Einon2011-10-232-9/+4
| | * | | | | staging: et131x: Match dma_alloc_ calls with dma_free_ callsMark Einon2011-10-231-8/+8
| | * | | | | staging: et131x: use dma_alloc... instead of pci_alloc...Mark Einon2011-10-232-18/+22
| | * | | | | staging: et131x: Fix issues when USE_FBR0 is not definedMark Einon2011-10-232-147/+158
| | * | | | | staging: et131x: Make rx_ring.fbr{0,1} share a common structureMark Einon2011-10-231-153/+140
| | * | | | | staging: et131x: Moving two extern inline functions to .c fileMark Einon2011-10-232-10/+11
| | * | | | | staging: et131x: Update TODO list - remove 'put driver into single file'Mark Einon2011-10-231-1/+0
| | * | | | | staging: et131x: move et1310_tx.h contents into et131x.cMark Einon2011-10-232-151/+86
| | * | | | | staging: et131x: move et1310_rx.h contents into et131x.cMark Einon2011-10-232-244/+180
| | * | | | | staging: et131x: move et131x_defs.h contents into et131x.cMark Einon2011-10-232-130/+64
| | * | | | | staging: et131x: move et131x_adapter.h contents into et131x.cMark Einon2011-10-232-218/+151
| | * | | | | staging: et131x: move et1310_phy.h contents into et131x.hMark Einon2011-10-233-291/+227
| | * | | | | staging: et131x: move et1310_address_map.h contents into et131x.hMark Einon2011-10-236-1442/+1370
| | * | | | | staging: et131x: Move non-register defines from et131x.h to et131x.cMark Einon2011-10-232-32/+32
| | * | | | | staging: et131x: Move function declarations from et131x.h to et131x.cMark Einon2011-10-232-102/+31