tree 191cf2b340d008b711137ce8c40b27a3dadff8d5
parent 8c95b4773dd8d0415269ffad7301ef96d75be8ee
parent 36b30ea940bb88d88c90698e0e3d97a805ab5856
author David S. Miller <davem@davemloft.net> 1208466793 -0700
committer David S. Miller <davem@davemloft.net> 1208466793 -0700

Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6