From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 9 Feb 2007 16:00:55 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.21-rc1~83^2~66
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b37df85960a34dd96d0a4695c650f7972ef56c30;p=linux-2.6-omap-h63xx.git

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.
---

b37df85960a34dd96d0a4695c650f7972ef56c30