Merge branches 'sh/core' and 'sh/serial-rework' into sh-fixes-for-linus

Browse source

...

This commit is contained in:

Paul Mundt 2011-11-04 22:48:36 +09:00

parent dfd3b596fb 3af1f8a41f

commit 78b425faaf

3 changed files with 32 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

arch/sh/kernel/cpu/sh2a/setup-sh7203.c

View file

19

drivers/tty/serial/sh-sci.c

View file

1

include/linux/serial_sci.h

View file