tree bf8c941eec540f0e30a37252be031c5504a24e16
parent b9a33cebac70d6f67a769ce8d4078fee2b254ada
parent 7bef4b397874eee4484457040e8a1013361d7758
author Linus Torvalds <torvalds@g5.osdl.org> 1141054871 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1141054871 -0800

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