Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Feb 2007 16:00:55 +0000 (08:00 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Feb 2007 16:00:55 +0000 (08:00 -0800)
commitb37df85960a34dd96d0a4695c650f7972ef56c30
tree6b096e3c01bbfd4bac062f3e013e9a43de1a8f4e
parent5986a2ec35836a878350c54af4bd91b1de6abc59
parent2cb4abd12bab7efd22a8b69d3b9a739500e8fee5
Merge branch 'upstream-linus' of /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.