summaryrefslogtreecommitdiffstats
path: root/arch/sh
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'v2.6.37-rc8' into perf/coreIngo Molnar2011-01-043-4/+3Star
|\
| * sh: Fix up SH7201 clkfwk build.Paul Mundt2010-12-241-1/+1
| * sh: mach-se: Fix up SE7206 build.Paul Mundt2010-12-241-1/+1
| * sh: Fix up SH4-202 clkfwk build.Paul Mundt2010-12-241-2/+1Star
* | Merge commit 'v2.6.37-rc7' into perf/coreIngo Molnar2010-12-223-2/+5
|\|
| * sh: wire up accept4 syscall (non-multiplexed path)Carmelo AMOROSO2010-12-142-1/+3
| * sh: Enable deprecated IRQ chip APIs for MFD and GPIOLIB drivers.Paul Mundt2010-12-131-1/+2
* | perf: Dynamic pmu typesPeter Zijlstra2010-12-161-1/+1
* | Merge commit 'v2.6.37-rc5' into perf/coreIngo Molnar2010-12-0713-92/+73Star
|\|
| * Merge branch 'sh/urgent' into sh-fixes-for-linusPaul Mundt2010-12-031-38/+5Star
| |\
| | * sh: se/7724: Remove FSI/B of GPIO init codeNobuhiro Iwamatsu2010-12-031-9/+1Star
| | * sh: se/7724: Update clock framework of FSI clock to non-legacyNobuhiro Iwamatsu2010-12-031-29/+4Star
| * | Merge branch 'sh/cachetlb' into sh-fixes-for-linusPaul Mundt2010-12-015-12/+12
| |\ \ | | |/ | |/|
| | * sh: Assume new page cache pages have dirty dcache lines.Paul Mundt2010-12-015-12/+12
| * | sh: boards: mach-se: use IS_ERR() instead of NULL checkVasiliy Kulikov2010-11-291-2/+2
| * | sh: Add div6_reparent_clks to clock framework for FSIKuninori Morimoto2010-11-293-35/+46
| |/
| * sh: Use GCC __builtin_prefetch() to implement prefetch().Giuseppe CAVALLARO2010-11-181-2/+5
| * sh: fix vsyscall compilation due to .eh_frame issueGiuseppe CAVALLARO2010-11-171-1/+1
| * sh: avoid to flush all cache in sys_cacheflushGiuseppe CAVALLARO2010-11-171-1/+1
| * sh: clkfwk: Kill off now unused algo_id in set_rate op.Paul Mundt2010-11-151-1/+1
* | perf, arch: Cleanup perf-pmu init vs lockup-detectorPeter Zijlstra2010-11-262-2/+2
|/
*-----. Merge branches 'sh/pio-death', 'sh/nommu', 'sh/clkfwk', 'sh/core' and 'sh/int...Paul Mundt2010-11-0844-1477/+158Star
|\ \ \ \
| | | | * sh: Simplify phys_addr_mask()/PTE_PHYS_MASK for 29/32-bit.Paul Mundt2010-11-041-12/+0Star
| |_|_|/ |/| | |
| | | * sh: make some needlessly global sh7724 clocks staticGuennadi Liakhovetski2010-11-081-3/+3
| |_|/ |/| |
| | * sh: nommu: Support building without an uncached mapping.Paul Mundt2010-11-044-42/+41Star
| | * sh: nommu: use 32-bit phys mode.Paul Mundt2010-11-045-14/+14
| | * sh: mach-se: Fix up SE7206 no ioport build.Paul Mundt2010-11-041-1/+3
| |/ |/|
| * sh: mach-se: Rip out superfluous 7751 PIO routines.Paul Mundt2010-10-293-138/+1Star
| * sh: mach-se: Rip out superfluous 770x PIO routines.Paul Mundt2010-10-293-179/+1Star
| * sh: mach-edosk7705: Kill off machtype, consolidate board def.Paul Mundt2010-10-295-14/+1Star
| * sh: mach-edosk7705: update for this century, kill off PIO trapping.Paul Mundt2010-10-293-82/+54Star
| * sh: mach-se: Rip out superfluous 7206 PIO routines.Paul Mundt2010-10-293-120/+1Star
| * sh: mach-systemh: Kill off dead board.Paul Mundt2010-10-299-397/+0Star
| * sh: mach-snapgear: Kill off machtype, consolidate board def.Paul Mundt2010-10-296-7/+2Star
| * sh: mach-snapgear: Rip out superfluous PIO routines.Paul Mundt2010-10-294-170/+11Star
| * sh: mach-microdev: SuperIO-relative ioport mapping.Paul Mundt2010-10-293-275/+3Star
* | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-10-305-95/+135
|\ \ | |/ |/|
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev...Russell King2010-10-285-95/+135
| |\
| | * sh: fix an ms7724se compile breakageGuennadi Liakhovetski2010-10-061-16/+16
| | * fbdev: sh_mobile_lcdcfb: Support multiple video modes in platform dataGuennadi Liakhovetski2010-09-145-95/+135
* | | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2010-10-291-7/+0Star
|\ \ \
| * \ \ Merge branch 'kbuild/rc-fixes' into kbuild/kconfigMichal Marek2010-10-1266-59505/+31Star
| |\ \ \
| * | | | kbuild: migrate all arch to the kconfig mainmenu upgradeArnaud Lacombe2010-09-201-7/+0Star
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-10-2830-243/+478
|\ \ \ \ \
| * | | | | sh: fix up cpu hotplug IRQ migration for irq_data changes.Paul Mundt2010-10-281-10/+14
| * | | | | sh: oprofile: Make sure the backtrace op is available for timer-fallback.Paul Mundt2010-10-271-2/+2
| * | | | | sh64: oprofile: Fix up kernel stack pointer size mismatch.Paul Mundt2010-10-271-1/+1
| * | | | | sh: oprofile: Fix up and extend op_name_from_perf_id().Paul Mundt2010-10-274-16/+21
| * | | | | sh: lockless get_user_pages_fast()Paul Mundt2010-10-272-1/+274
| * | | | | sh64: _PAGE_SPECIAL support.Paul Mundt2010-10-273-6/+7