diff options
author | Olof Johansson <olof@lixom.net> | 2013-06-28 02:04:00 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-06-28 02:04:00 +0200 |
commit | fbd1a04b210d56ef84200df56fc0291746d4d4dc (patch) | |
tree | d3e963a13fb2c027129c9342a204a430b88c2f90 /drivers/tty | |
parent | Merge tag 'davinci-for-v3.11/dt' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | gpio: msm-v1: Remove errant __devinit to fix compile (diff) | |
download | linux-fbd1a04b210d56ef84200df56fc0291746d4d4dc.tar.xz linux-fbd1a04b210d56ef84200df56fc0291746d4d4dc.zip |
Merge branch 'msm/fixes' into next/late
Merging in msm/fixes to avoid silly conflicts at top level.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/tty')
0 files changed, 0 insertions, 0 deletions