aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-01-073-3/+3
|\
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...Paul Mundt2011-01-079-348/+261
| |\
| * \ Merge branch 'rmobile/urgent' into rmobile-latestPaul Mundt2010-12-213-2/+6
| |\ \
| * \ \ Merge branch 'common/mmcif' into rmobile/mmcifPaul Mundt2010-11-303-3/+3
| |\ \ \
| | * | | sh, mmc: Make mmcif_update_progress static inlineSimon Horman2010-11-293-3/+3
* | | | | Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2011-01-071-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | TTY: Add tty ioctl to figure device node of the system console.Werner Fink2010-12-161-0/+1
| | |/ / | |/| |
* | | | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-061-21/+17
|\ \ \ \
| * \ \ \ Merge branch 'misc' into develRussell King2011-01-061-21/+17
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'smp' into miscRussell King2011-01-0611-169/+50
| | |\ \ \ | | | | |/ | | | |/|
| | * | | ARM: 6483/1: arm & sh: factorised duplicated clkdev.cJean-Christop PLAGNIOL-VILLARD2010-11-261-21/+17
* | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...Paul Mundt2011-01-061-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | sh: wire up accept4 syscall (non-multiplexed path)Carmelo AMOROSO2010-12-141-1/+2
* | | | | sh: correct definitions to access stack pointersRoel Kluin2011-01-053-4/+4
* | | | | sh: Tidy up SH-4A unaligned load support.Paul Mundt2010-12-241-112/+52
* | | | | sh: mach-sdk7786: Handle baseboard NMI source selection.Paul Mundt2010-12-171-0/+8
* | | | | Merge branches 'sh/urgent' and 'sh/rsk-updates' into sh-latestPaul Mundt2010-12-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'sh/cachetlb' into sh-fixes-for-linusPaul Mundt2010-12-011-1/+1
| |\ \ \ \
| | * | | | sh: Assume new page cache pages have dirty dcache lines.Paul Mundt2010-12-011-1/+1
| | | |/ / | | |/| |
* | | | | Merge branch 'sh/urgent' into sh-latestPaul Mundt2010-11-302-2/+8
|\ \ \ \ \ | |/ / / /
| * | | | sh: Add div6_reparent_clks to clock framework for FSIKuninori Morimoto2010-11-291-0/+3
| |/ / /
| * | | sh: Use GCC __builtin_prefetch() to implement prefetch().Giuseppe CAVALLARO2010-11-181-2/+5
| | |/ | |/|
* | | Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latestPaul Mundt2010-11-093-211/+180
|\ \ \ | |/ / |/| |
| * | sh: machvec IO death.Paul Mundt2010-11-013-211/+180
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'sh/pio-death', 'sh/nommu', 'sh/clkfwk', 'sh/core' and 'sh/int...Paul Mundt2010-11-0810-167/+45
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| | | * sh: Simplify phys_addr_mask()/PTE_PHYS_MASK for 29/32-bit.Paul Mundt2010-11-041-12/+0
| |_|/ |/| |
| | * sh: nommu: Support building without an uncached mapping.Paul Mundt2010-11-044-42/+41
| | * sh: nommu: use 32-bit phys mode.Paul Mundt2010-11-041-4/+4
| |/ |/|
| * sh: mach-edosk7705: Kill off machtype, consolidate board def.Paul Mundt2010-10-291-7/+0
| * sh: mach-systemh: Kill off dead board.Paul Mundt2010-10-291-71/+0
| * sh: mach-snapgear: Kill off machtype, consolidate board def.Paul Mundt2010-10-291-0/+0
| * sh: mach-snapgear: Rip out superfluous PIO routines.Paul Mundt2010-10-291-22/+0
| * sh: mach-microdev: SuperIO-relative ioport mapping.Paul Mundt2010-10-291-9/+0
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-10-284-6/+8
|\
| * sh64: _PAGE_SPECIAL support.Paul Mundt2010-10-273-6/+7
| * sh: Expose physical addressing mode through cpuinfo.Paul Mundt2010-10-261-0/+1
* | mm: remove pte_*map_nested()Peter Zijlstra2010-10-262-5/+0
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-10-2527-280/+657
|\
| * sh: mach-sdk7786: Add support for the FPGA SRAM.Paul Mundt2010-10-152-1/+17
| * sh: Provide a generic SRAM pool for tiny memories.Paul Mundt2010-10-151-0/+38
| * sh: pci: Support secondary FPGA-driven PCIe clocks on SDK7786.Paul Mundt2010-10-141-1/+1
| * sh: pci: Support slot 4 routing on SDK7786.Paul Mundt2010-10-141-0/+9
| * sh: wire up perf alignment and emulation faults.Paul Mundt2010-10-131-1/+1
| * sh: Fix up the SH-3 build.Paul Mundt2010-10-071-0/+1
| * sh: mach-x3proto: Support for baseboard GPIOs.Paul Mundt2010-10-041-0/+12
| * sh: mach-x3proto: Move the ilsel header to a better place.Paul Mundt2010-10-041-0/+0
| * sh: Allow GPIO chips to register IRQ mappings.Paul Mundt2010-10-031-4/+2
| * sh: pinmux support for SH-X3 proto CPUs.Paul Mundt2010-10-021-0/+64
| * sh: Update SH-X3 subtype for clkdev lookups.Paul Mundt2010-10-011-1/+3
| * sh: provide generic arch_debugfs_dir.Paul Mundt2010-09-241-2/+0