summaryrefslogtreecommitdiffstats
path: root/drivers/net/sungem_phy.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-05-14 10:19:22 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-05-14 10:19:22 +1000
commit8b6ee04067310a6397476f05f06e52dabd8b0bb6 (patch)
tree022a153b777a9e38f49d46e4fb8f1e6747d4a5f4 /drivers/net/sungem_phy.c
parentb48d441a8ab8a89bd32a3a981a05b8a26905dfc7 (diff)
parent7c0482e3d055e5de056d3c693b821e39205b99ae (diff)
downloadop-kernel-dev-8b6ee04067310a6397476f05f06e52dabd8b0bb6.zip
op-kernel-dev-8b6ee04067310a6397476f05f06e52dabd8b0bb6.tar.gz
Merge branch 'merge' into next
We want the irq fixes from the "merge" branch.
Diffstat (limited to 'drivers/net/sungem_phy.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud