tree 642dcf3b36d563aa7bb070a2a9355805483e857a
parent b11d0e48aa41b644143ca526ef8d69212fdc1cdd
parent 1cf9e8a7865c0ac216034e519cf6b8505055ea50
author Linus Torvalds <torvalds@g5.osdl.org> 1134452537 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1134452537 -0800

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