summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_posJan Blunck2010-04-271-3/+3
* MIPS: Fix SSB PCIcore IO resource managementAndreas Ferber2010-04-121-29/+0
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-04-094-7/+7
|\
| *---. Merge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linusRoland Dreier2010-04-093-7/+6
| |\ \ \
| | | | * RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp()Chien Tung2010-04-071-5/+4
| | | * | IB/mlx4: Check correct variable for allocation failureDan Carpenter2010-04-071-1/+1
| | | |/
| | * / IB/cm: Fix device_create() return value checkJani Nikula2010-03-311-1/+1
| | |/
| * / RDMA/cm: Set num_paths when manually assigning path recordsSean Hefty2010-04-071-0/+1
| |/
* | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2010-04-091-1/+1
|\ \
| * | [S390] sclp_async: potential buffer overflowDan Carpenter2010-04-091-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-04-0914-58/+121
|\ \ \
| * | | loop: Update mtime when writing using aopsNikanth Karthikesan2010-04-081-0/+2
| * | | drbd: lc_element_by_index() never returns NULLPhilipp Reisner2010-04-021-1/+1
| * | | cciss: unlock on error pathDan Carpenter2010-04-021-0/+1
| * | | Merge branch 'master' into for-linusJens Axboe2010-03-19505-7180/+9662
| |\ \ \
| * | | | Remove GENHD_FL_DRIVERFSNeilBrown2010-03-161-1/+1
| * | | | block: Finalize conversion of block limits functionsMartin K. Petersen2010-03-152-4/+2
| * | | | paride: fix off-by-one testRoel Kluin2010-03-123-6/+6
| * | | | drbd: fix al-to-on-disk-bitmap for 4k logical_block_sizeLars Ellenberg2010-03-111-4/+13
| * | | | drbd: Renamed overwrite_peer to primary_forcePhilipp Reisner2010-03-111-1/+1
| * | | | drbd: Forcing primary should also work for Consistent disks [Bugz 266]Philipp Reisner2010-03-111-2/+2
| * | | | drbd: Make sure we do not send state updates during an empty resync [Bugz 271]Philipp Reisner2010-03-111-2/+1
| * | | | drbd: Reduce the time an empty resync takes usuallyPhilipp Reisner2010-03-113-3/+12
| * | | | drbd: add missing drbd command names to avoid <NULL> in error messagesLars Ellenberg2010-03-111-0/+3
| * | | | drbd_disconnect: grab meta.socket mutex as wellLars Ellenberg2010-03-112-3/+4
| * | | | fix unit of rs_same_csums accountingLars Ellenberg2010-03-111-1/+2
| * | | | drbd: fix broken state change after split-brain attach while connectedLars Ellenberg2010-03-111-1/+6
| * | | | drbd: fix NULL pointer dereference on 4k hard sect sizeLars Ellenberg2010-03-111-19/+19
| * | | | drbd: --dry-run option for drbdsetup net ( drbdadm -- --dry-run connect <res> )Philipp Reisner2010-03-113-5/+41
| * | | | block: drbd: Convert semaphore to mutexThomas Gleixner2010-03-111-5/+5
* | | | | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air...Linus Torvalds2010-04-0933-298/+508
|\ \ \ \ \
| * \ \ \ \ Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linusDave Airlie2010-04-0924-241/+429
| |\ \ \ \ \
| | * | | | | drm/nouveau: bail out of auxch transaction if we repeatedly recieve defersBen Skeggs2010-04-091-1/+7
| | * | | | | drm/nv50: implement gpio set/get routinesBen Skeggs2010-04-094-7/+86
| | * | | | | drm/nv50: parse/use some more de-magiced parts of gpio table entriesBen Skeggs2010-04-092-14/+11
| | * | | | | drm/nouveau: store raw gpio table entry in bios gpio structsBen Skeggs2010-04-092-28/+21
| | * | | | | drm/nv40: Init some tiling-related PGRAPH state.Francisco Jerez2010-04-091-0/+21
| | * | | | | drm/nv50: Add NVA3 support in ctxprog/ctxvals generator.Marcin Koƛcielnicki2010-04-091-1/+12
| | * | | | | drm/nv50: another dodgy DP hackBen Skeggs2010-04-091-0/+3
| | * | | | | drm/nv50: punt hotplug irq handling out to workqueueBen Skeggs2010-04-094-5/+12
| | * | | | | drm/nv50: preserve an unknown SOR_MODECTRL value for DP encodersBen Skeggs2010-04-092-1/+22
| | * | | | | drm/nv50: Allow using the NVA3 new compute class.Marcin Koƛcielnicki2010-04-091-3/+4
| | * | | | | drm/nv50: cleanup properly if PDISPLAY init failsBen Skeggs2010-04-091-1/+3
| | * | | | | drm/nouveau: fixup the init failure paths some moreBen Skeggs2010-04-091-1/+7
| | * | | | | drm/nv50: fix instmem init on IGPs if stolen mem crosses 4GiB markBen Skeggs2010-04-091-3/+4
| | * | | | | drm/nv40: add LVDS table quirk for Dell Latitude D620Ben Skeggs2010-04-091-0/+15
| | * | | | | drm/nv40: rework lvds table parsingBen Skeggs2010-04-092-28/+17
| | * | | | | drm/nouveau: detect vram amount once, and save the valueBen Skeggs2010-04-098-76/+74
| | * | | | | drm/nouveau: remove some unused members from drm_nouveau_privateBen Skeggs2010-04-092-11/+0
| | * | | | | drm/nouveau: Make use of TTM busy_placements.Francisco Jerez2010-04-093-59/+61