summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-01-06 12:44:05 -0800
committerOlof Johansson <olof@lixom.net>2012-01-06 12:44:05 -0800
commit7996bad8e62d8ca5888a935185ce313e693814b2 (patch)
tree143009838741ddff77315bdf4d8f41a7db6d3c5b /drivers/net
parent8b69791215857e3e885d27b3945759ace820794a (diff)
parent1bd51cdd91a5cbe9c4379ab5d74a4015ffdf0e51 (diff)
Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions