summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* firmware: Remove obsolete Chelsio cxgb3 firmwareTim Gardner2012-08-022-1936/+0
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-08-0114-72/+108
|\
| * MIPS: Loongson 2: Sort out clock managment.Ralf Baechle2012-08-017-51/+33
| * MIPS: Loongson 1: more clk support and add select HAVE_CLKYoichi Yuasa2012-08-012-0/+17
| * MIPS: txx9: Fix redefinition of clk_* by adding select HAVE_CLKYoichi Yuasa2012-08-011-0/+1
| * MIPS: BCM63xx: Fix redefinition of clk_* by adding select HAVE_CLKYoichi Yuasa2012-08-011-0/+1
| * MIPS: AR7: Fix redefinition of clk_* by adding select HAVE_CLKYoichi Yuasa2012-08-011-0/+1
| * MIPS: Lantiq: Platform specific CLK fixupJohn Crispin2012-08-011-0/+5
| * MIPS: Lantiq: Add device_tree_init functionJohn Crispin2012-08-011-0/+22
| * MIPS: Lantiq: Fix interface clock and PCI control register offsetJohn Crispin2012-08-011-21/+28
* | Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-08-0123-302/+206
|\ \
| * | um: Add arch/x86/um to MAINTAINERSRichard Weinberger2012-08-021-0/+1
| * | um: pass siginfo to guest processMartin Pärtel2012-08-0210-34/+71
| * | um: fix ubd_file_size for read-only filesMartin Pärtel2012-08-021-1/+1
| * | um: pull interrupt_end() into userspace()Al Viro2012-08-022-8/+6
| * | um: split syscall_trace(), pass pt_regs to itAl Viro2012-08-023-43/+34
| * | um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regsAl Viro2012-08-013-5/+5
| * | um: set BLK_CGROUP=y in defconfigRichard Weinberger2012-07-281-1/+1
| * | um: remove count_lockRichard Weinberger2012-07-282-7/+0
| * | um: fully use tty_portRichard Weinberger2012-07-284-78/+65
| * | um: Remove dead codeRichard Weinberger2012-07-281-26/+0
| * | um: remove line_ioctl()Richard Weinberger2012-07-284-90/+0
| * | TTY: um/line, use tty from tty_portJiri Slaby2012-07-283-9/+21
| * | TTY: um/line, add tty_portJiri Slaby2012-07-282-4/+5
* | | Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-08-0128-1415/+2124
|\ \ \
| | \ \
| | \ \
| *-. \ \ Merge branches 'dma-omap', 'dma-pl08x' and 'dma-sa11x0' into dmaengineRussell King2012-07-3111-785/+614
| |\ \ \ \
| | | * | | 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
| | * | | | dmaengine: PL08x: split DMA signal muxing from channel allocRussell King2012-07-011-7/+36
| | * | | | dmaengine: PL08x: get rid of unnecessary checks in dma_slave_configRussell King2012-07-017-158/+20
| | * | | | dmaengine: PL08x: ignore 'direction' argument in dma_slave_configRussell King2012-07-011-38/+18
| | * | | | dmaengine: PL08x: extract function to to generate cctl valuesRussell King2012-07-011-21/+32
| | * | | | dmaengine: PL08x: move the bus and increment selection to dma prepare functionRussell King2012-07-011-12/+14
OpenPOWER on IntegriCloud