tree 6b096e3c01bbfd4bac062f3e013e9a43de1a8f4e
parent 5986a2ec35836a878350c54af4bd91b1de6abc59
parent 2cb4abd12bab7efd22a8b69d3b9a739500e8fee5
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171036855 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171036855 -0800

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  MAINTAINERS: update DMFE and wireless drivers mailing list
  ucc_geth: Add support to local-mac-address property
  ucc_geth: Remove obsolete workaround of link speed change
  cxgb3: sysfs attributes in -mm tree
  Add Attansic L1 ethernet driver.