Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Fri, 25 Apr 2008 07:31:07 +0000 (00:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 25 Apr 2008 07:31:07 +0000 (00:31 -0700)
commitcc93d7d77d28d65d4f947dabc95a01c42d713ea3
treebdaa01a54c7d881b7087551daf85fa52c61b3d1c
parent461e6c856faf9cdd8862fa4d0785974a64e39dba
parentf946dffed6334f08da065a89ed65026ebf8b33b4
Merge branch 'upstream-davem' of /linux/kernel/git/jgarzik/netdev-2.6