summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpcLinus Torvalds2012-08-027-2/+345
|\
| * Platform: OLPC: move global variables into priv structAndres Salomon2012-07-311-20/+28
| * Platform: OLPC: move debugfs support from x86 EC driverAndres Salomon2012-07-311-0/+117
| * x86: OLPC: switch over to using new EC driver on x86Andres Salomon2012-07-311-5/+0
| * Platform: OLPC: add a suspended flag to the EC driverAndres Salomon2012-07-311-1/+45
| * Platform: OLPC: turn EC driver into a platform_driverAndres Salomon2012-07-311-0/+48
| * Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call itAndres Salomon2012-07-311-2/+110
| * drivers: OLPC: update various drivers to include olpc-ec.hAndres Salomon2012-07-314-2/+4
| * Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driverAndres Salomon2012-07-313-0/+21
* | Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-08-022-13/+37
|\ \
| * \ Merge branch 'marvell/dt' into late2/dtOlof Johansson2012-07-2919-54/+471
| |\ \
| | * | ATA: sata_mv: Add device tree supportAndrew Lunn2012-07-271-13/+29
| | * | ARM: Orion: DTify the watchdog timer.Andrew Lunn2012-07-271-0/+8
| | * | Merge branch 'v3.5-rc7-fixes' into v3.5-rc7-dt-v3Andrew Lunn2012-07-276-2/+24
| | |\ \
| | * \ \ Merge tag 'spi-3.6' into v3.5-rc7-dt-v3Andrew Lunn2012-07-2711-39/+410
| | |\ \ \
* | | \ \ \ Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-shLinus Torvalds2012-08-029-26/+124
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'common/irqdomain' into sh-latestPaul Mundt2012-08-015-5/+85
| |\ \ \ \ \ \
| | * | | | | | sh: intc: initial irqdomain support.Paul Mundt2012-08-015-5/+85
| * | | | | | | Merge branch 'common/pinctrl' into sh-latestPaul Mundt2012-08-011-17/+15
| |\ \ \ \ \ \ \
| | * | | | | | | sh: pfc: Fix up init ordering mess.Paul Mundt2012-08-011-17/+15
| * | | | | | | | Merge branch 'sh/dmaengine' into sh-latestPaul Mundt2012-08-011934-62202/+198204
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | serial: sh-sci: fix compilation breakage, when DMA is enabledGuennadi Liakhovetski2012-08-011-2/+3
| | * | | | | | | dmaengine: shdma: restore partial transfer calculationGuennadi Liakhovetski2012-08-012-0/+21
| | |/ / / / / /
| * | | | | | | sh: pfc: Build fix for pinctrl_remove_gpio_range() changes.Paul Mundt2012-07-251-2/+0
* | | | | | | | Merge tag 'md-3.6' of git://neil.brown.name/mdLinus Torvalds2012-08-025-22/+150
|\ \ \ \ \ \ \ \
| * | | | | | | | md/dm-raid: DM_RAID should select MD_RAID10NeilBrown2012-08-021-2/+3
| * | | | | | | | md/raid1: submit IO from originating thread instead of md thread.NeilBrown2012-08-022-4/+55
| * | | | | | | | raid5: raid5d handle stripe in batch wayShaohua Li2012-08-021-13/+32
| * | | | | | | | raid5: make_request use batch stripe releaseShaohua Li2012-08-022-3/+60
* | | | | | | | | Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-08-0111-1123/+2070
|\ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ Merge branches 'dma-omap', 'dma-pl08x' and 'dma-sa11x0' into dmaengineRussell King2012-07-313-500/+595
| |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | dmaengine: sa11x0-dma: add cyclic DMA supportRussell King2012-07-011-16/+92
| | | * | | | | | | | | dmaengine: sa11x0-dma: fix DMA residue supportRussell King2012-07-011-16/+29
| | * | | | | | | | | | dmaengine: PL08x: ensure all descriptors are freed when channel is releasedRussell King2012-07-011-0/+2
| | * | | | | | | | | | dmaengine: PL08x: get rid of write only pool_ctr and free_txd lockingRussell King2012-07-011-12/+0
| | * | | | | | | | | | dmaengine: PL08x: get rid of pl08x_prep_channel_resourcesRussell King2012-07-011-23/+9
| | * | | | | | | | | | dmaengine: PL08x: fix tx_status function to return correct residueRussell King2012-07-011-27/+34
| | * | | | | | | | | | dmaengine: PL08x: convert to use vchan done listRussell King2012-07-011-81/+54
| | * | | | | | | | | | dmaengine: PL08x: convert to use vchan submitted/issued listsRussell King2012-07-011-47/+17
| | * | | | | | | | | | dmaengine: PL08x: use vchan's spinlockRussell King2012-07-012-25/+21
| | * | | | | | | | | | dmaengine: PL08x: convert to use virt-dma structsRussell King2012-07-011-28/+29
| | * | | | | | | | | | dmaengine: PL08x: rejig physical channel allocationRussell King2012-07-011-156/+112
| | * | | | | | | | | | dmaengine: PL08x: start next descriptor from irq contextRussell King2012-07-011-4/+5
| | * | | | | | | | | | dmaengine: PL08x: split the pend_list in twoRussell King2012-07-011-13/+28
| | * | | | | | | | | | dmaengine: PL08x: re-jig the starting of txdsRussell King2012-07-011-20/+17
| | * | | | | | | | | | dmaengine: PL08x: remove waiting descriptor pointerRussell King2012-07-011-7/+1
| | * | | | | | | | | | dmaengine: PL08x: move DMA signal muxing into slave prepare codeRussell King2012-07-011-47/+32
| | * | | | | | | | | | dmaengine: PL08x: convert to a list of completed descriptorsRussell King2012-07-011-10/+20
| | * | | | | | | | | | dmaengine: PL08x: track mux usage on a per-channel basis.Russell King2012-07-011-5/+13
| | * | | | | | | | | | dmaengine: PL08x: move DMA signal muxing into pl08x_dma_chan structRussell King2012-07-011-14/+15