summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-01-262-3/+4
|\
| * sh: Fix build of sh7750 base boardsNobuhiro Iwamatsu2011-01-251-3/+3
| * sh: Fix sh build failure when CONFIG_SFC=mAurelien Jarno2011-01-191-0/+1
* | Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-01-131-1/+0
|\ \ | |/ |/|
| * Merge branch 'linus' into idle-testLen Brown2011-01-1231-599/+450
| |\
| * | SH, cpuidle: delete use of NOP CPUIDLE_FLAGS_SHALLOWLen Brown2011-01-121-1/+0
* | | Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let...Linus Torvalds2011-01-1327-38/+254
|\ \ \
| * \ \ Merge branch 'common/serial-rework' into sh-latestPaul Mundt2011-01-1325-11/+214
| |\ \ \
| | * \ \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...Paul Mundt2011-01-13163-6293/+16536
| | |\ \ \ | | | | |/ | | | |/|
| | * | | serial: sh-sci: Move SCBRR calculation algo in to platform data.Paul Mundt2009-06-2424-0/+88
| | * | | serial: sh-sci: Move SCSCR_INIT in to platform data.Paul Mundt2009-06-2424-26/+123
| * | | | sh: sh7372 SH4AL-DSP probe supportMagnus Damm2011-01-132-1/+6
| * | | | Merge branch 'sh/sdio' into sh-latestPaul Mundt2011-01-125-26/+33
| |\ \ \ \
| | * | | | sh: sh7366 Enable SDIO IRQsMagnus Damm2011-01-121-10/+14
| | * | | | sh: sh7343 Enable SDIO IRQsMagnus Damm2011-01-121-11/+14
| | * | | | sh: sh7723 / ap325rxa enable SDIO IRQsArnd Hannemann2011-01-121-2/+2
| | * | | | sh: sh7722 Enable SDIO IRQsArnd Hannemann2011-01-121-1/+1
| | * | | | sh: sh7724 Enable SDIO IRQsArnd Hannemann2011-01-121-2/+2
| | | |/ / | | |/| |
| | | | |
| | \ \ \
| *-. \ \ \ Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latestPaul Mundt2011-01-111-4/+31
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | sh: add PVR probing for SH7757 3rd cutYoshihiro Shimoda2011-01-111-0/+1
* | | | | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-131-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'master' into for-nextJiri Kosina2010-12-225-11/+46
| |\ \ \ \ \
| * | | | | | suspend: constify platform_suspend_opsLionel Debroux2010-11-161-1/+1
* | | | | | | Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2011-01-071-4/+31
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch 'usb-next' into musb-mergeGreg Kroah-Hartman2010-12-161-4/+31
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | sh: Add EHCI support for SH7786.Paul Mundt2010-11-011-4/+31
| | |/ / / /
* | | | | | 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
|/ /