diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 10:34:05 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 10:34:05 +1000 |
| commit | 16c531aaf40fe079b907ecd20080115ea1bf76d4 (patch) | |
| tree | d0387f3e55aeec51a2cfcd32fe5a2d5e55103a5f /arch/sh/boards/Kconfig | |
| parent | 33fd9711237970d03102a60f6bfb03fc9da8f9d2 (diff) | |
| parent | ff0210f6f9ed59e8f761d045b8e979bd6e5cf93a (diff) | |
Merge remote branch '52xx-and-virtex/next'
Conflicts:
drivers/serial/mpc52xx_uart.c
Diffstat (limited to 'arch/sh/boards/Kconfig')
0 files changed, 0 insertions, 0 deletions