diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 22:56:30 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 22:57:10 (GMT) |
| commit | 7256ecc2b7b91b4212ccc5511cb12254bdf806d0 (patch) | |
| tree | 1a39b3de03cfc92c5b5dedfb01174d17b49df18a /drivers/tty | |
| parent | 18bbff9f679cd470db66402fdb9c577b34324183 (diff) | |
| parent | 6ed3e2acc7995625625592abe8cd3383c34a471b (diff) | |
| download | linux-fsl-qoriq-7256ecc2b7b91b4212ccc5511cb12254bdf806d0.tar.xz | |
Merge branch 'sa11x0-mcp' into sa11x0
Conflicts:
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/generic.c
arch/arm/mach-sa1100/lart.c
arch/arm/mach-sa1100/shannon.c
Diffstat (limited to 'drivers/tty')
0 files changed, 0 insertions, 0 deletions