02a8da60458e6b
author Linus Torvalds <torvalds@g5.osdl.org> 1139335444 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1139335444 -0800

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Žær