aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-02 12:34:03 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-02 12:34:03 -0800
commit115e8e705e4be071b9e06ff72578e3b603f2ba65 (patch)
tree8ef96f62ed5239442cd55ad54ea5c97b0441e613 /drivers/net/ethernet/marvell
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentdt/device: Fix auxdata matching to handle entries without a name override (diff)
downloadlinux-dev-115e8e705e4be071b9e06ff72578e3b603f2ba65.tar.xz
linux-dev-115e8e705e4be071b9e06ff72578e3b603f2ba65.zip
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: dt/device: Fix auxdata matching to handle entries without a name override
Diffstat (limited to 'drivers/net/ethernet/marvell')
0 files changed, 0 insertions, 0 deletions