diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-11 16:42:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-11 16:42:17 +1100 |
| commit | fcb6fc854da7145a9c4745af3b68fdeccb140a1c (patch) | |
| tree | b962617e48a5e335d52fe745ed7fee4f9a47a788 /arch/arm/mach-omap2/board-cm-t35.c | |
| parent | 4adf475f352d8e1384b0f4dff1f86f3dea5e7bf8 (diff) | |
| parent | ed43b47b29bce303f86e1bff69b6f9924f5afcc4 (diff) | |
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t35.c')
0 files changed, 0 insertions, 0 deletions