summaryrefslogtreecommitdiffstats
path: root/arch/sh (follow)
Commit message (Expand)AuthorAgeFilesLines
*-----. Merge branches 'sh/pio-death', 'sh/nommu', 'sh/clkfwk', 'sh/core' and 'sh/int...Paul Mundt2010-11-0844-1477/+158
|\ \ \ \
| | | | * sh: Simplify phys_addr_mask()/PTE_PHYS_MASK for 29/32-bit.Paul Mundt2010-11-041-12/+0
| |_|_|/ |/| | |
| | | * 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/+41
| | * 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/+1
| * sh: mach-se: Rip out superfluous 770x PIO routines.Paul Mundt2010-10-293-179/+1
| * sh: mach-edosk7705: Kill off machtype, consolidate board def.Paul Mundt2010-10-295-14/+1
| * sh: mach-edosk7705: update for this century, kill off PIO trapping.Paul Mundt2010-10-293-82/+54
| * sh: mach-se: Rip out superfluous 7206 PIO routines.Paul Mundt2010-10-293-120/+1
| * sh: mach-systemh: Kill off dead board.Paul Mundt2010-10-299-397/+0
| * sh: mach-snapgear: Kill off machtype, consolidate board def.Paul Mundt2010-10-296-7/+2
| * sh: mach-snapgear: Rip out superfluous PIO routines.Paul Mundt2010-10-294-170/+11
| * sh: mach-microdev: SuperIO-relative ioport mapping.Paul Mundt2010-10-293-275/+3
* | 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/+0
|\ \ \
| * \ \ Merge branch 'kbuild/rc-fixes' into kbuild/kconfigMichal Marek2010-10-1266-59505/+31
| |\ \ \
| * | | | kbuild: migrate all arch to the kconfig mainmenu upgradeArnaud Lacombe2010-09-201-7/+0
* | | | | 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
| * | | | | sh: disable deprecated genirq support.Paul Mundt2010-10-271-0/+1
| * | | | | sh: update show_interrupts() for irq_data chip lookup.Paul Mundt2010-10-271-1/+6
| * | | | | sh64: irq_data conversion.Paul Mundt2010-10-272-50/+15
| * | | | | sh64: update for IRQ flag handling naming changes.Paul Mundt2010-10-271-8/+8
| * | | | | sh: mach-se: irq_data conversion.Paul Mundt2010-10-274-31/+32
| * | | | | sh: hd64461: irq_data conversion.Paul Mundt2010-10-271-8/+11
| * | | | | sh: mach-x3proto: irq_data conversion.Paul Mundt2010-10-271-3/+4
| * | | | | sh: mach-systemh: irq_data conversion.Paul Mundt2010-10-271-36/+21
| * | | | | sh: imask IRQs irq_data conversion.Paul Mundt2010-10-271-5/+9
| * | | | | sh: mach-microdev: irq_data conversion.Paul Mundt2010-10-271-19/+11
| * | | | | sh: mach-landisk: irq_data conversion.Paul Mundt2010-10-271-8/+7
| * | | | | sh: IPR IRQs irq_data conversion.Paul Mundt2010-10-271-13/+12
| * | | | | sh: mach-dreamcast: irq_data conversion.Paul Mundt2010-10-271-7/+10
| * | | | | 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: Tidy up genirq Kconfig bits.Paul Mundt2010-10-261-10/+3
| * | | | | sh: Sanitize sparse irqThomas Gleixner2010-10-261-3/+3
| * | | | | sh: Expose physical addressing mode through cpuinfo.Paul Mundt2010-10-263-0/+6
* | | | | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-10-285-9/+0
|\ \ \ \ \ \
| * | | | | | [media] soc_camera: Don't use module names to load I2C modulesLaurent Pinchart2010-10-234-7/+0
| * | | | | | [media] sh_vou: Don't use module names to load I2C modulesLaurent Pinchart2010-10-232-2/+0