tree 53bdf1534f73c59fe8ae796f660cab541a20224c
parent f49e1aa133c2c9b74b5dfddca8863609bbda9086
parent 2f4489112896770d66dc2960f71174d69ee23004
author David S. Miller <davem@davemloft.net> 1206511885 -0700
committer David S. Miller <davem@davemloft.net> 1206511885 -0700

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