Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Tue, 28 Oct 2008 18:01:07 +0000 (11:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 Oct 2008 18:01:07 +0000 (11:01 -0700)
commitb3ed4bc082077045f680400c8bb02fa8d9c9ecf5
tree688e77a9da979bb978dddb4d02374d1c532bceac
parentea2d8b59bc7b770fde03de2bb9b3ee46e8bdc8d5
parent753dcfeecc0e293dbe6f3d59643741af9e610f4f
Merge branch 'davem-fixes' of /linux/kernel/git/jgarzik/netdev-2.6