Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 7 Aug 2007 00:52:56 +0000 (17:52 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 7 Aug 2007 00:52:56 +0000 (17:52 -0700)
commit9e865f58da5ff0a9c19669a49ac984117711757a
tree21f64e79ac21d794df5a407f10a9326e26d38f17
parent111e2a513bac77d317011350f34f9cc30deb9806
parentbe1b685fe6c9928848b26b568eaa86ba8ce0046c
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.