diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-27 14:26:06 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-27 14:26:06 +0200 |
| commit | 4022acdb5b2b65ad2fe078be39bda9c5377c4e04 (patch) | |
| tree | 9afc2b61b309e61e2e136f0b881acd73e4372c9b /drivers/tty | |
| parent | Merge branch 'sti/soc' into next/late (diff) | |
| parent | ARM: shmobile: BOCK-W: change Ether device name (diff) | |
| download | linux-4022acdb5b2b65ad2fe078be39bda9c5377c4e04.tar.xz linux-4022acdb5b2b65ad2fe078be39bda9c5377c4e04.zip | |
Merge branch 'renesas/boards2' into next/late
Conflicts:
arch/arm/mach-shmobile/setup-r8a7778.c
This is a dependency for the Renesas sh-sci updates.
Signedf-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/tty')
0 files changed, 0 insertions, 0 deletions