summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-27 17:04:00 -0700
committerOlof Johansson <olof@lixom.net>2013-06-27 17:04:00 -0700
commitfbd1a04b210d56ef84200df56fc0291746d4d4dc (patch)
treed3e963a13fb2c027129c9342a204a430b88c2f90 /drivers/pci
parentb88923451f792643a4b23fd2cab266a4cd4350da (diff)
parent7ba655fc965b073292349fa49fb9d16d701185bc (diff)
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/pci')
0 files changed, 0 insertions, 0 deletions