• Paul Mundt's avatar
    Merge branch 'master' of... · f43dc23d
    Paul Mundt authored
    Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
    
    Conflicts:
    	arch/sh/kernel/cpu/sh2/setup-sh7619.c
    	arch/sh/kernel/cpu/sh2a/setup-mxg.c
    	arch/sh/kernel/cpu/sh2a/setup-sh7201.c
    	arch/sh/kernel/cpu/sh2a/setup-sh7203.c
    	arch/sh/kernel/cpu/sh2a/setup-sh7206.c
    	arch/sh/kernel/cpu/sh3/setup-sh7705.c
    	arch/sh/kernel/cpu/sh3/setup-sh770x.c
    	arch/sh/kernel/cpu/sh3/setup-sh7710.c
    	arch/sh/kernel/cpu/sh3/setup-sh7720.c
    	arch/sh/kernel/cpu/sh4/setup-sh4-202.c
    	arch/sh/kernel/cpu/sh4/setup-sh7750.c
    	arch/sh/kernel/cpu/sh4/setup-sh7760.c
    	arch/sh/kernel/cpu/sh4a/setup-sh7343.c
    	arch/sh/kernel/cpu/sh4a/setup-sh7366.c
    	arch/sh/kernel/cpu/sh4a/setup-sh7722.c
    	arch/sh/kernel/cpu/sh4a/setup-sh7723.c
    	arch/sh/kernel/cpu/sh4a/setup-sh7724.c
    	arch/sh/kernel/cpu/sh4a/setup-sh7763.c
    	arch/sh/kernel/cpu/sh4a/setup-sh7770.c
    	arch/sh/kernel/cpu/sh4a/setup-sh7780.c
    	arch/sh/kernel/cpu/sh4a/setup-sh7785.c
    	arch/sh/kernel/cpu/sh4a/setup-sh7786.c
    	arch/sh/kernel/cpu/sh4a/setup-shx3.c
    	arch/sh/kernel/cpu/sh5/setup-sh5.c
    	drivers/serial/sh-sci.c
    	drivers/serial/sh-sci.h
    	include/linux/serial_sci.h
    f43dc23d
setup-sh7619.c 5.35 KB