summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* ARM: EXYNOS4: Fix the merge conflictKukjin Kim2011-11-051-3/+0
* Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2011-11-0433-1762/+1229
|\
| * ARM: SAMSUNG: Remove Samsung specific enum type for dma directionBoojin Kim2011-09-148-25/+19
| * ASoC: Samsung: Update DMA interfaceBoojin Kim2011-09-143-7/+7
| * ARM: SAMSUNG: Remove S3C-PL330-DMA driverBoojin Kim2011-09-145-1288/+6
| * ARM: S5P64X0: Use generic DMA PL330 driverBoojin Kim2011-09-145-96/+201
| * ARM: S5PC100: Use generic DMA PL330 driverBoojin Kim2011-09-144-116/+222
| * ARM: S5PV210: Use generic DMA PL330 driverBoojin Kim2011-09-144-116/+214
| * ARM: EXYNOS4: Use generic DMA PL330 driverBoojin Kim2011-09-143-114/+198
| * ARM: SAMSUNG: Add common DMA operationsBoojin Kim2011-09-148-3/+347
| * ARM: SAMSUNG: Update to use PL330-DMA driverBoojin Kim2011-09-147-10/+19
| * Merge branch 'next' into v3.1-rc4Vinod Koul2011-09-021-0/+4
| |\
| | * ARM: asm/pl080.h: Protect against multiple inclusion of header fileViresh Kumar2011-08-251-0/+4
* | | Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-blockLinus Torvalds2011-11-042-8/+3
|\ \ \
| * \ \ Merge branch 'v3.1-rc10' into for-3.2/coreJens Axboe2011-10-19336-1285/+2408
| |\ \ \
| * | | | block: remove support for bio remapping from ->make_requestChristoph Hellwig2011-09-122-8/+3
| | |_|/ | |/| |
* | | | Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tileLinus Torvalds2011-11-0420-4396/+4637
|\ \ \ \
| * | | | arch/tile: factor out <arch/opcode.h> headerChris Metcalf2011-11-0315-4359/+4536
| * | | | arch/tile: add the <arch> headers to the set of installed kernel headersChris Metcalf2011-11-032-0/+19
| * | | | arch/tile: avoid exporting a symbol no longer used by gccChris Metcalf2011-11-031-2/+0
| * | | | arch/tile: avoid ISO namespace pollution with <asm/sigcontext.h>Chris Metcalf2011-11-032-35/+82
* | | | | Merge branch 'process_vm' of git://git.kernel.org/pub/scm/linux/kernel/git/ae...Linus Torvalds2011-11-042-1/+5
|\ \ \ \ \
| * | | | | [IA64] Wire up cross memory attach syscallsTony Luck2011-11-022-1/+5
* | | | | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-11-045-14/+13
|\ \ \ \ \ \
| * | | | | | [media] ARM: mach-shmobile: mackerel doesn't need legacy SOCAM_* flags anymoreGuennadi Liakhovetski2011-11-031-3/+0
| * | | | | | [media] sh: migor: remove unused ov772x buswidth flagGuennadi Liakhovetski2011-11-031-3/+1
| * | | | | | [media] sh: ap3rxa: remove redundant soc-camera platform data fieldsGuennadi Liakhovetski2011-11-031-5/+1
| * | | | | | [media] ARM: PXA: use gpio_set_value_cansleep() on pcm990Guennadi Liakhovetski2011-11-031-2/+2
| * | | | | | [media] sh: convert ap325rxa to mediabus flagsGuennadi Liakhovetski2011-11-031-0/+4
| * | | | | | [media] ARM: mach-shmobile: convert mackerel to mediabus flagsGuennadi Liakhovetski2011-11-031-0/+4
| * | | | | | [media] ARM: ap4evb: switch imx074 configuration to default number of lanesGuennadi Liakhovetski2011-11-031-1/+1
* | | | | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2011-11-0372-2850/+3050
|\ \ \ \ \ \ \
| * | | | | | | MIPS: O32: Provide definition of registers ta0 .. ta3.Ralf Baechle2011-10-241-0/+6
| * | | | | | | MIPS: perf: Add Octeon support for hardware perf.David Daney2011-10-242-1/+148
| * | | | | | | MIPS: perf: Add support for 64-bit perf counters.David Daney2011-10-241-469/+389
| * | | | | | | MIPS: perf: Reorganize contents of perf support files.David Daney2011-10-244-520/+532
| * | | | | | | MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.cDavid Daney2011-10-242-57/+37
| * | | | | | | MIPS: Add accessor macros for 64-bit performance counter registers.David Daney2011-10-241-0/+8
| * | | | | | | MIPS: Add probes for more Octeon II CPUs.David Daney2011-10-241-0/+3
| * | | | | | | MIPS: Add more CPU identifiers for Octeon II CPUs.David Daney2011-10-241-0/+3
| * | | | | | | MIPS: XLR, XLS: Add comment for smp setupHillf Danton2011-10-241-0/+4
| * | | | | | | MIPS: JZ4740: GPIO: Check correct IRQ in demux handlerLars-Peter Clausen2011-10-241-1/+1
| * | | | | | | MIPS: JZ4740: GPIO: Simplify IRQ demuxerLars-Peter Clausen2011-10-241-7/+1
| * | | | | | | MIPS: JZ4740: Use generic irq chipLars-Peter Clausen2011-10-245-153/+79
| * | | | | | | MIPS: Alchemy: remove all CONFIG_SOC_AU1??? definesManuel Lauss2011-10-2411-334/+410
| * | | | | | | MIPS: Alchemy: kill au1xxx.h headerManuel Lauss2011-10-244-46/+4
| * | | | | | | MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? definesManuel Lauss2011-10-249-236/+207
| * | | | | | | MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header depManuel Lauss2011-10-245-6/+14
| * | | | | | | MIPS: Alchemy: Redo PCI as platform driverManuel Lauss2011-10-2419-625/+950
| * | | | | | | MIPS: Alchemy: more base address cleanupManuel Lauss2011-10-2413-247/+146
OpenPOWER on IntegriCloud