tree dfaf465122239a8bb450913b2e95f4647d24892f
parent 7f28f394bd68e58bf3938c67bbeca7825b4687b8
parent c8868611389aa28e0e5e0d63f468727781eac68c
author Linus Torvalds <torvalds@g5.osdl.org> 1127519041 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1127519041 -0700

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