tree 3cf1fd6858cab9c030e5cd0d98d04fc0b7bd41b3
parent fe05f54181db868c5720cc4dc0741227b9ba5a60
parent b5b9d6647c1cd5eee90b58941c55f874c2a7e707
author Linus Torvalds <torvalds@g5.osdl.org> 1141254645 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1141254645 -0800

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