summaryrefslogtreecommitdiffstats
path: root/drivers/net/vmxnet3
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-28 09:36:21 +0100
committerGrant Likely <grant.likely@secretlab.ca>2011-02-28 09:36:21 +0100
commit38a5d6736e7f714cc56d58692001e66dcbb98799 (patch)
tree337d32375e10b04642013710c2c424514474b32c /drivers/net/vmxnet3
parentaltera_ps2: Add devicetree support (diff)
parentLinux 2.6.38-rc6 (diff)
downloadlinux-38a5d6736e7f714cc56d58692001e66dcbb98799.tar.xz
linux-38a5d6736e7f714cc56d58692001e66dcbb98799.zip
Merge commit 'v2.6.38-rc6' into devicetree/next
Conflicts: drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'drivers/net/vmxnet3')
0 files changed, 0 insertions, 0 deletions