From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 7 Aug 2007 00:52:56 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.23-rc3~96
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=9e865f58da5ff0a9c19669a49ac984117711757a;p=safe%2Fjmp%2Flinux-2.6

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETFILTER]: Add xt_statistic.h to the header list for usermode programs
  [BNX2]: Fix suspend/resume problem.
  [TG3]: Fix suspend/resume problem.
---

9e865f58da5ff0a9c19669a49ac984117711757a