tree 21f64e79ac21d794df5a407f10a9326e26d38f17
parent 111e2a513bac77d317011350f34f9cc30deb9806
parent be1b685fe6c9928848b26b568eaa86ba8ce0046c
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1186447976 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1186447976 -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:
  [NETFILTER]: Add xt_statistic.h to the header list for usermode programs
  [BNX2]: Fix suspend/resume problem.
  [TG3]: Fix suspend/resume problem.