tree 6f1574a9de786c8c345ac852eff12d65b2d75bfe
parent 14591de147f7c9656fa2b9c05680d2b46e286c40
parent 166c3436d683cfe5316c7723ed746a93db053f12
author Linus Torvalds <torvalds@g5.osdl.org> 1136828345 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1136828345 -0800

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