tree 9601e631cee6651c638cc7b4d2d9b7cf20b6b485
parent d81fec0f97cce4aea36a89340af247523c1263a0
parent d4faaecbcc6d9ea4f7c05f6de6af98e2336a4afb
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192173994 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192173994 -0700

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