summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* 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-0122-302/+205
|\ \
| * | 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-0114-144/+13
|\ \ \
| | \ \
| | \ \
| *-. \ \ Merge branches 'dma-omap', 'dma-pl08x' and 'dma-sa11x0' into dmaengineRussell King2012-07-317-137/+11
| |\ \ \ \
| | * | | | dmaengine: PL08x: get rid of unnecessary checks in dma_slave_configRussell King2012-07-015-128/+4
| | * | | | ARM: spear: update for PL08x dma engine changesRussell King2012-07-012-9/+7
| | |/ / /
| * | | | ARM: 7481/1: OMAP2+: omap2plus_defconfig: enable OMAP DMA engineJavier Martinez Canillas2012-07-311-0/+2
| * | | | ARM: omap: remove mmc platform data dma_mask and initializationRussell King2012-07-316-7/+0
| |/ / /
* | | | Merge branch 'audit' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-08-015-85/+58
|\ \ \ \
| * | | | ARM: 7475/1: sys_trace: allow all syscall arguments to be updated via ptraceWill Deacon2012-07-281-1/+2
| * | | | ARM: 7474/1: get rid of TIF_SYSCALL_RESTARTSYSAl Viro2012-07-284-20/+10
| * | | | ARM: 7473/1: deal with handlerless restarts without leaving the kernelAl Viro2012-07-282-22/+35
| * | | | ARM: 7472/1: pull all work_pending logics into C functionAl Viro2012-07-282-23/+21
| * | | | ARM: 7471/1: Revert "7442/1: Revert "remove unused restart trampoline""Will Deacon2012-07-283-17/+0
| * | | | ARM: 7470/1: Revert "7443/1: Revert "new way of handling ERESTART_RESTARTBLOCK""Will Deacon2012-07-283-29/+17
* | | | | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-08-0113-194/+139
|\ \ \ \ \
| * | | | | ARM: 7479/1: mm: avoid NULL dereference when flushing gate_vma with VIVT cachesWill Deacon2012-07-311-2/+6
| * | | | | ARM: Fix undefined instruction exception handlingRussell King2012-07-314-62/+92
| * | | | | ARM: 7480/1: only call smp_send_stop() on SMPJavier Martinez Canillas2012-07-311-1/+2
| * | | | | ARM: 7478/1: errata: extend workaround for erratum #720789Will Deacon2012-07-311-0/+12
| * | | | | ARM: 7477/1: vfp: Always save VFP state in vfp_pm_suspend on UPColin Cross2012-07-311-0/+6
| * | | | | ARM: 7476/1: vfp: only clear vfp state for current cpu in vfp_pm_suspendColin Cross2012-07-311-1/+1
| * | | | | ARM: 7468/1: ftrace: Trace function entry before updating indexColin Cross2012-07-311-8/+9
| * | | | | ARM: 7467/1: mutex: use generic xchg-based implementation for ARMv6+Will Deacon2012-07-311-115/+4
| * | | | | ARM: 7466/1: disable interrupt before spinning endlesslyShawn Guo2012-07-311-0/+2
| * | | | | ARM: 7465/1: Handle >4GB memory sizes in device tree and mem=size@start optionPeter Maydell2012-07-292-5/+5
* | | | | | Merge tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linux-2.6Linus Torvalds2012-08-012-4/+22
|\ \ \ \ \ \
| * | | | | | arm: da850: configure LCDC fifo thresholdManjunathappa, Prakash2012-07-291-0/+1
| * | | | | | Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into ...Florian Tobias Schandinat2012-07-251-4/+21
| |\ \ \ \ \ \
| | * | | | | | ARM: OMAP2PLUS: DSS: Disable LCD3 output when resetting DSSChandrabhanu Mahapatra2012-06-291-4/+21
OpenPOWER on IntegriCloud