summaryrefslogtreecommitdiffstats
path: root/include/linux/ppp_defs.h
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2014-07-24 23:10:02 +0000
committerJason Cooper <jason@lakedaemon.net>2014-07-24 23:10:02 +0000
commit54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743 (patch)
tree924613494fac61514c0fc806920ed5032f2322a6 /include/linux/ppp_defs.h
parentb03e119fff8a06f55faaaa11c6259829fe81cbb4 (diff)
parente53b1fd432497942a0fdfd0e89c3d30241cb4d2c (diff)
Merge branch 'mvebu/soc-cpuidle' into mvebu/soc
Conflicts: arch/arm/mach-mvebu/pmsu.c
Diffstat (limited to 'include/linux/ppp_defs.h')
0 files changed, 0 insertions, 0 deletions