summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-0616-201/+14
|\
| * Merge branch 'misc' into develRussell King2011-01-0616-201/+14
| |\
| | * Merge branch 'smp' into miscRussell King2011-01-064-6/+6
| | |\
| | * | ARM: 6483/1: arm & sh: factorised duplicated clkdev.cJean-Christop PLAGNIOL-VILLARD2010-11-2616-201/+14
* | | | Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let...Linus Torvalds2011-01-0612-391/+402
|\ \ \ \
| * | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...Paul Mundt2011-01-062-2/+2
| |\| | |
| * | | | Merge branch 'sh/urgent' into sh-latestPaul Mundt2010-11-304-8/+42
| |\ \ \ \
| | \ \ \ \
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latestPaul Mundt2010-11-095-203/+213
| |\ \ \ \ \ \
| | * | | | | | sh: machvec IO death.Paul Mundt2010-11-015-203/+213
| | | |_|_|/ / | | |/| | | |
| * | | | | | sh: Break out cpuinfo_op procfs bits.Paul Mundt2010-11-093-145/+149
| * | | | | | sh: migrate SH_CLK_MD to mode pin API.Paul Mundt2010-11-094-43/+40
| | |/ / / / | |/| | | |
* | | | | | Merge commit 'v2.6.37-rc8' into perf/coreIngo Molnar2011-01-042-3/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | sh: Fix up SH7201 clkfwk build.Paul Mundt2010-12-241-1/+1
| * | | | | sh: Fix up SH4-202 clkfwk build.Paul Mundt2010-12-241-2/+1
* | | | | | Merge commit 'v2.6.37-rc7' into perf/coreIngo Molnar2010-12-221-0/+1
|\| | | | |
| * | | | | sh: wire up accept4 syscall (non-multiplexed path)Carmelo AMOROSO2010-12-141-0/+1
| | |_|/ / | |/| | |
* | | | | perf: Dynamic pmu typesPeter Zijlstra2010-12-161-1/+1
* | | | | Merge commit 'v2.6.37-rc5' into perf/coreIngo Molnar2010-12-074-8/+42
|\| | | |
| * | | | sh: Add div6_reparent_clks to clock framework for FSIKuninori Morimoto2010-11-291-5/+39
| | |_|/ | |/| |
| * | | 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
|/ /
* / sh: make some needlessly global sh7724 clocks staticGuennadi Liakhovetski2010-11-081-3/+3
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-10-289-87/+68
|\
| * sh: fix up cpu hotplug IRQ migration for irq_data changes.Paul Mundt2010-10-281-10/+14
| * sh: oprofile: Fix up and extend op_name_from_perf_id().Paul Mundt2010-10-272-2/+2
| * sh: update show_interrupts() for irq_data chip lookup.Paul Mundt2010-10-271-1/+6
| * sh64: irq_data conversion.Paul Mundt2010-10-271-40/+9
| * sh64: update for IRQ flag handling naming changes.Paul Mundt2010-10-271-8/+8
| * sh: imask IRQs irq_data conversion.Paul Mundt2010-10-271-5/+9
| * sh: IPR IRQs irq_data conversion.Paul Mundt2010-10-271-13/+12
| * sh: Fix the sparsemem disabled build.Paul Mundt2010-10-271-0/+1
| * sh: Switch dynamic IRQ creation to generic irq allocator.Paul Mundt2010-10-261-6/+0
| * sh: Sanitize sparse irqThomas Gleixner2010-10-261-3/+3
| * sh: Expose physical addressing mode through cpuinfo.Paul Mundt2010-10-262-0/+5
* | ptrace: cleanup arch_ptrace() on shNamhyung Kim2010-10-272-24/+33
* | ptrace: change signature of arch_ptrace()Namhyung Kim2010-10-272-12/+15
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2010-10-251-1/+1
|\
| * Merge branch 'topic/asoc' into for-linusTakashi Iwai2010-10-251-1/+1
| |\
| | * sh: fix an SIU device name mismatchGuennadi Liakhovetski2010-09-191-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-10-2528-1051/+2432
|\ \ \
| * | | sh: perf: Set up perf_max_events.Paul Mundt2010-10-131-0/+1
| * | | sh: perf: Support SH-X3 hardware counters.Paul Mundt2010-10-131-1/+19
| * | | sh: wire up perf alignment and emulation faults.Paul Mundt2010-10-133-8/+29
| * | | sh: Fix address calculation of InitrdNobuhiro Iwamatsu2010-10-061-3/+4
| * | | sh: fix uninitialized spinlockAkinobu Mita2010-10-061-1/+1
| * | | sh: Wire up INTC subgroup splitting for SH7786 SCIF1.Paul Mundt2010-10-051-38/+72
| * | | sh: intc: Support virtual mappings for IRQ subgroups.Paul Mundt2010-10-051-0/+2
| * | | sh: Drop __initdata for SH-X3 pinmux tables.Paul Mundt2010-10-041-5/+5