tree 09933113cf28f253db1dd539463bdab741d67139
parent 62c592edead3c3a045662595f7ade3c12f133373
parent ed735ccbefaf7e5e3ef61418f7e209b8c59308a7
author Linus Torvalds <torvalds@g5.osdl.org> 1125425790 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1125425790 -0700

Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git