aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/air...Linus Torvalds2011-01-1720-262/+124
|\
| * drm/radeon/kms: balance asic_reset functionsAlex Deucher2011-01-173-18/+20
| * drm/radeon/kms: remove duplicate card_posted() functionsAlex Deucher2011-01-173-46/+3
| * drm/radeon/kms: add module option for pcie gen2Alex Deucher2011-01-175-0/+14
| * drm/radeon/kms: fix typo in evergreen safe regAlex Deucher2011-01-171-1/+1
| * Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next i...Dave Airlie2011-01-1711-197/+86
| |\
| | * drm/nouveau: fix gpu page faults triggered by plymouthdBen Skeggs2011-01-171-2/+2
| | * drm/nouveau: greatly simplify mm, killing some bugs in the processBen Skeggs2011-01-173-160/+52
| | * drm/nvc0: enable protection of system-use-only structures in vmBen Skeggs2011-01-174-5/+10
| | * drm/nv40: initialise 0x17xx on all chipsets that have itBen Skeggs2011-01-171-12/+2
| | * drm/nv40: make detection of 0x4097-ful chipsets available everywhereBen Skeggs2011-01-173-18/+20
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2011-01-1713-844/+994
|\ \ \ | |/ / |/| |
| * | ARM: PL08x: cleanup commentsRussell King - ARM Linux2011-01-162-117/+72
| * | Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.cWei Yongquan2011-01-141-2/+2
| * | ARM: PL08x: fix a warningDan Williams2011-01-141-1/+1
| * | Fix dmaengine_submit() return typeRussell King - ARM Linux2011-01-141-1/+1
| * | dmaengine: at_hdmac: fix race while monitoring channel statusNicolas Ferre2011-01-141-2/+2
| * | dmaengine: at_hdmac: flags located in first descriptorNicolas Ferre2011-01-141-3/+3
| * | dmaengine: at_hdmac: use subsys_initcall instead of module_initEric Xu2011-01-141-1/+1
| * | dmaengine: at_hdmac: no need set ACK in new descriptorNicolas Ferre2011-01-141-1/+0
| * | dmaengine: at_hdmac: trivial add precision to unmapping commentNicolas Ferre2011-01-141-1/+1
| * | dmaengine: at_hdmac: use dma_address to program DMA hardwareNicolas Ferre2011-01-141-2/+2
| * | pch_dma: support new device ML7213 IOHTomoya MORINAGA2011-01-142-7/+21
| | |
| | \
| *-. \ Merge branches 'amba' and 'dma40' into dmaengineDan Williams2011-01-076-706/+871
| |\ \ \
| | | * | dmaengine: dma40: Add support to split up large elementsPer Forlin2011-01-044-130/+351
| | * | | ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channelsRussell King - ARM Linux2011-01-041-0/+3
| | * | | ARM: PL08x: allow dma_set_runtime_config() to return errorsRussell King - ARM Linux2011-01-041-10/+13
| | * | | ARM: PL08x: fix locking between prepare function and submit functionRussell King - ARM Linux2011-01-042-23/+9
| | * | | ARM: PL08x: introduce 'phychan_hold' to hold on to physical channelsRussell King - ARM Linux2011-01-042-0/+14
| | * | | ARM: PL08x: put txd's on the pending list in pl08x_tx_submit()Russell King - ARM Linux2011-01-041-14/+32
| | * | | ARM: PL08x: rename 'desc_list' as 'pend_list'Russell King - ARM Linux2011-01-042-12/+12
| | * | | ARM: PL08x: implement unmapping of memcpy buffersRussell King - ARM Linux2011-01-041-13/+39
| | * | | ARM: PL08x: store prep_* flags in async_tx structureRussell King - ARM Linux2011-01-041-3/+5
| | * | | ARM: PL08x: shrink srcbus/dstbus in txd structureRussell King - ARM Linux2011-01-042-12/+12
| | * | | ARM: PL08x: don't manipulate txd->srcbus or txd->dstbus during LLI fillRussell King - ARM Linux2011-01-041-76/+83
| | * | | ARM: PL08x: fix fill_bytes calculationRussell King - ARM Linux2011-01-041-16/+10
| | * | | ARM: PL08x: use min() to calculate target_lenRussell King - ARM Linux2011-01-041-3/+1
| | * | | ARM: PL08x: ensure pl08x_pre_boundary() works for any value of addrRussell King - ARM Linux2011-01-041-9/+5
| | * | | ARM: PL08x: make pl08x_fill_lli_for_desc() return voidRussell King - ARM Linux2011-01-041-18/+12
| | * | | ARM: PL08x: move callback outside spinlock'd regionRussell King - ARM Linux2011-01-041-14/+15
| | * | | ARM: PL08x: allow AHB master port selection to be configuredRussell King - ARM Linux2011-01-042-36/+56
| | * | | ARM: PL08x: move AHB master port selection into prep_* functionsRussell King - ARM Linux2011-01-041-24/+23
| | * | | ARM: PL08x: move cctl increment and protection setup to prep_slave_sgRussell King - ARM Linux2011-01-041-7/+8
| | * | | ARM: PL08x: move default cctl into txd structureRussell King - ARM Linux2011-01-042-16/+8
| | * | | ARM: PL08x: assign ccfg DMA request signal in prep_phy_channel()Russell King - ARM Linux2011-01-041-11/+9
| | * | | ARM: PL08x: move ccfg into txd structureRussell King - ARM Linux2011-01-042-17/+17
| | * | | ARM: PL08x: avoid duplicating registers in txd and phychan structuresRussell King - ARM Linux2011-01-042-51/+19
| | * | | ARM: PL08x: combine functions to start DMA into one functionRussell King - ARM Linux2011-01-041-60/+38
| | * | | ARM: PL08x: clean up LLI lookupRussell King - ARM Linux2011-01-041-17/+20
| | * | | ARM: PL08x: rename lli.next to lli.lliRussell King - ARM Linux2011-01-041-6/+6