tree f8f4ed7bbc05369aadfd32668b892fe2740a0f3b
parent 1836098f97d22c81652aeeec64d1819dc2177bdb
parent 3df3cc6d18b6dcd38c33c198fb8adf1f1fa5f4a7
author Linus Torvalds <torvalds@g5.osdl.org> 1135454116 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1135454116 -0800

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