tree 228ac07333de66aa16bacab46fa939112b99b7aa
parent 8cf0d9d075916c9affa53a0cfa8d1b94c9e95fd7
parent 6da0f685935e13458a2206ac872d0d3c67a52f65
author  <jgarzik@pretzel.yyz.us> 1117073488 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1117073488 -0400

Automatic merge of /spare/repo/netdev-2.6 branch sis900