tree 0222e33d9ce59212f309114294424187691f2ca9
parent 712fbdd33306aa07085d1e648b5f3d45d7943794
parent ee05f031ec72cc06abc4002992649c3a8344d246
author Linus Torvalds <torvalds@evo.osdl.org> 1125647213 -0700
committer Linus Torvalds <torvalds@evo.osdl.org> 1125647213 -0700

Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6