aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma...Linus Torvalds2012-04-041-10/+18
|\
| * SH: adapt for dma_map_ops changesAndrzej Pietrasiewicz2012-03-281-10/+18
* | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-shLinus Torvalds2012-03-306-181/+170
|\ \
| * | sh: Support I/O space swapping where needed.Paul Mundt2012-03-292-15/+59
| * | sh: Consolidate duplicate _32/_64 unistd definitions.Paul Mundt2012-03-283-80/+40
| * | sh: Avoid exporting unimplemented syscalls.Paul Mundt2012-03-282-62/+63
| * | sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785Nobuhiro Iwamatsu2012-03-281-17/+5
| * | sh: dma: Collect up CHCR of SH7723 and SH7730Nobuhiro Iwamatsu2012-03-281-7/+3
| * | sh/next: Fix build fail by asm/system.h in asm/bitops.hNobuhiro Iwamatsu2012-03-281-1/+0
* | | Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-03-292-9/+0
|\ \ \
| * | | sh: Remove unnecessary posix_types.h type overridesH. Peter Anvin2012-02-142-9/+0
* | | | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-291-11/+0
|\ \ \ \
| * | | | sh: intc: unify evt2irq/irq2evt macros for sh and armRob Herring2012-01-251-11/+0
| |/ / /
* | | | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-2829-373/+484
|\ \ \ \ | |_|/ / |/| | |
| * | | Delete all instances of asm/system.hDavid Howells2012-03-281-8/+0
| * | | Move all declarations of free_initmem() to linux/mm.hDavid Howells2012-03-281-1/+0
| * | | Disintegrate asm/system.h for SHDavid Howells2012-03-2829-372/+492
* | | | Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-1/+1
|\ \ \ \
| * | | | sh: sh header sh_clk_ops renameMagnus Damm2012-03-121-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-03-231-6/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | PCI: collapse pcibios_resource_to_busBjorn Helgaas2012-02-231-2/+0
| * | | sh/PCI: get rid of device resource fixupsBjorn Helgaas2012-02-231-5/+1
| | |/ | |/|
* | | fbdev: sh_mobile_lcdc: Remove board configuration board_data fieldLaurent Pinchart2012-03-122-9/+9
| |/ |/|
| |
| \
*-. \ Merge branches 'sh/urgent' and 'sh/platform-updates' into sh-latestPaul Mundt2012-01-272-2/+8
|\ \ \ | | |/ | |/|
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-01-172-2/+8
| |\ \ | | |/ | |/|
| | * Audit: push audit success and retcode into arch ptrace.hEric Paris2012-01-172-2/+8
* | | sh: Defer to asm-generic/device.h.Paul Mundt2012-01-131-4/+4
|/ /
* | Merge branch 'sh/hwblk' into sh-latestPaul Mundt2012-01-125-88/+7
|\ \
| * | sh: sh7722: fix Oops: remove empty clock entriesGuennadi Liakhovetski2011-11-241-8/+5
| * | sh: sh7723.h: bugfix: remove unused clock indexKuninori Morimoto2011-11-241-2/+1
| * | sh: sh7724.h: bugfix: remove unused clock indexKuninori Morimoto2011-11-241-2/+1
| * | sh: hwblk: Kill off remaining bits of hwblk API.Paul Mundt2011-11-181-74/+0
| * | sh: hwblk: Kill off hwblk_id from pdev archdata.Paul Mundt2011-11-181-1/+0
| * | sh: cpuidle: Migrate off of hwblk API.Paul Mundt2011-11-181-1/+0
* | | Merge branch 'sh/pm-runtime' into sh-latestPaul Mundt2012-01-122-10/+6
|\ \ \ | |/ /
| * | sh: Kill off remaining private runtime PM bits.Paul Mundt2011-11-181-9/+0
| * | sh: sh7723: use runtime PM implementation, common with arm/mach-shmobileGuennadi Liakhovetski2011-11-181-1/+3
| * | sh: sh7722: use runtime PM implementation, common with arm/mach-shmobileGuennadi Liakhovetski2011-11-181-1/+1
| * | sh: sh7724: use runtime PM implementation, common with arm/mach-shmobileGuennadi Liakhovetski2011-11-181-1/+4
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2012-01-093-8/+2
|\ \ \ | | |/ | |/|
| * | Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-081-2/+0
| |\ \
| | * | freezer: remove now unused TIF_FREEZETejun Heo2011-11-211-2/+0
| * | | Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2012-01-071-2/+2
| |\ \ \
| | * \ \ Merge branch 'driver-core-next' into Linux 3.2Greg Kroah-Hartman2012-01-061-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | sh: dma - convert sysdev_class to a regular subsystemKay Sievers2011-12-211-2/+2
| | | |/
| * | | memblock: Fix include breakages caused by 24aa07882bTejun Heo2011-12-081-4/+0
| |/ /
* | | sh: clkfwk: clock-sh7724: all div6_clks use SH_CLK_DIV6_EXT()Kuninori Morimoto2011-12-061-0/+1
|/ /
* | sh: Wire up process_vm syscalls.Paul Mundt2011-11-112-2/+6
* | sh: Fix cached/uncaced address calculation in 29bit modeNobuhiro Iwamatsu2011-11-041-0/+5
|/
* sh: kexec: Add PHYSICAL_STARTSimon Horman2011-10-281-0/+10