From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 12 Oct 2007 07:26:34 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.24-rc1~1448
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cbd09dbbb62096c1da627eca865f988d2ed0a84e;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [ZLIB]: Fix external builds of zlib_inflate code.
  [TG3]: Fix APE induced regression
  [SKY2]: version 1.19
  [SKY2]: use netdevice stats struct
  [SKY2]: fiber advertise bits initialization (trivial)
  [SKY2]: fix power settings on Yukon XL
  [SKY2]: ethtool register reserved area blackout
---

cbd09dbbb62096c1da627eca865f988d2ed0a84e