Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Sat, 29 Mar 2008 02:48:26 +0000 (19:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 29 Mar 2008 02:48:26 +0000 (19:48 -0700)
commit17eed249539a7b756ca65a5cb0940abc48ef553b
treeea8745536e7ee5aaf0d3b03e9d356979daf6bfb0
parent4ad96d39a2d74c1b2e400b602da2594f5098fc26
parent318a94d68979cbe9cc98a3050b4b7be2f08513c8
Merge branch 'upstream-net26' of /linux/kernel/git/jgarzik/netdev-2.6