summaryrefslogtreecommitdiff
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* parisc: fix compile failure with kmap_atomic changesJames Bottomley2010-10-281-4/+4
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2010-10-276-229/+147
|\
| * Merge branch 'dma40' into dmaengineDan Williams2010-10-192-50/+22
| |\
| | * ste_dma40: remove channel_typeRabin Vincent2010-10-191-9/+0
| | * ste_dma40: remove enum for endianessRabin Vincent2010-10-192-11/+2
| | * ste_dma40: remove TIM_FOR_LINK optionRabin Vincent2010-10-192-6/+0
| | * ste_dma40: move mode_opt to separate configRabin Vincent2010-10-192-11/+11
| | * ste_dma40: move channel mode to a separate fieldRabin Vincent2010-10-192-9/+10
| | * ste_dma40: move priority to separate fieldRabin Vincent2010-10-192-7/+2
| | |
| | \
| | \
| | \
| *---. \ Merge branches 'dma40', 'pl08x', 'fsldma', 'imx' and 'intel-mid' into dmaengineDan Williams2010-10-074-143/+86
| |\ \ \ \ | | |_|_|/ | |/| | |
| | | | * dmaengine: Add Freescale i.MX SDMA supportSascha Hauer2010-10-053-6/+86
| | | |/ | | |/|
| | | * fsldma: improved DMA_SLAVE supportIra Snyder2010-10-071-137/+0
| | |/
| * | DMAENGINE: define a dummy filter function for ste_dma40Linus Walleij2010-10-071-0/+19
| * | DMAENGINE: Remove stedma40_set_psize and pre_transfer hook in ste_dma40Per Forlin2010-10-071-23/+1
| * | DMAENGINE: ste_dma40: added kernel doc for structJonas Aaberg2010-09-221-7/+15
| * | DMAENGINE: ste_dma40: removed non-used variable from structJonas Aaberg2010-09-222-3/+0
| * | DMAENGINE: ste_dma40: code clean-upJonas Aaberg2010-09-221-6/+7
| * | DMAENGINE: ste_dma40: config checksLinus Walleij2010-09-221-1/+1
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300Linus Torvalds2010-10-27137-1944/+9384
|\ \
| * | MN10300: Save frame pointer in thread_info struct rather than global varDavid Howells2010-10-2714-145/+75
| * | MN10300: Change "Matsushita" to "Panasonic".Akira Takeuchi2010-10-273-5/+5
| * | MN10300: Create a defconfig for the ASB2364 boardAkira Takeuchi2010-10-271-0/+98
| * | MN10300: Update the ASB2303 defconfigAkira Takeuchi2010-10-271-0/+2
| * | MN10300: ASB2364: Add support for SMSC911X and SMC911XAkira Takeuchi2010-10-275-0/+233
| * | MN10300: ASB2364: Handle the IRQ multiplexer in the FPGADavid Howells2010-10-277-19/+166
| * | MN10300: Generic time supportMark Salter2010-10-2712-115/+401
| * | MN10300: Specify an ELF HWCAP flag for MN10300 Atomic Operations Unit supportMark Salter2010-10-271-0/+10
| * | MN10300: Map userspace atomic op regs as a vmalloc pageMark Salter2010-10-272-0/+24
| * | MN10300: And Panasonic AM34 subarch and implement SMPAkira Takeuchi2010-10-2779-481/+4494
| * | MN10300: Delete idle_timestamp from irq_cpustat_tAkira Takeuchi2010-10-272-3/+0
| * | MN10300: Make various interrupt priority settings configurableAkira Takeuchi2010-10-272-6/+76
| * | MN10300: Optimise do_csum()Akira Takeuchi2010-10-271-27/+22
| * | MN10300: Implement atomic ops using atomic ops unitMark Salter2010-10-272-47/+351
| * | MN10300: Make the FPU operate in non-lazy mode under SMPAkira Takeuchi2010-10-2714-248/+440
| * | MN10300: SMP TLB flushingAkira Takeuchi2010-10-274-29/+290
| * | MN10300: Use the [ID]PTEL2 registers rather than [ID]PTEL for TLB controlAkira Takeuchi2010-10-273-47/+65
| * | MN10300: Make the use of PIDR to mark TLB entries controllableAkira Takeuchi2010-10-274-62/+84
| * | MN10300: Rename __flush_tlb*() to local_flush_tlb*()David Howells2010-10-276-28/+42
| * | MN10300: AM34 erratum requires MMUCTR read and write on exception entryAkira Takeuchi2010-10-273-6/+37
| * | MN10300: Make the boot wrapper able to use writeback cachingAkira Takeuchi2010-10-271-1/+48
| * | MN10300: Cache: Implement SMP global cache flushingAkira Takeuchi2010-10-279-15/+535
| * | MN10300: Allow some cacheflushes to be avoided if cache snooping is availableDavid Howells2010-10-279-96/+309
| * | MN10300: AM34: Add cacheflushing by using the AM34 purge registersAkira Takeuchi2010-10-274-1/+678
| * | MN10300: SMP: Differentiate local cache flushingAkira Takeuchi2010-10-274-112/+289
| * | MN10300: Cacheflush functions should take unsigned long addressesAkira Takeuchi2010-10-272-15/+15
| * | MN10300: AM34: The current cacheflush routines operate by controlling tag regsDavid Howells2010-10-274-2/+23
| * | MN10300: Reorder asm/cacheflush.h to put primitives firstDavid Howells2010-10-271-44/+44
| * | MN10300: Provide a MN10300_CACHE_ENABLED config optionDavid Howells2010-10-276-10/+13
| * | MN10300: Cache: Split cache bits out of arch KconfigDavid Howells2010-10-272-28/+33
| * | MN10300: Remove monitor/JTAG functionsAkira Takeuchi2010-10-274-55/+2
View Lorry Controller Status