tree 0747ab5547556b7955de7bf8fcfd0fab542e790d
parent f3ed8b444781158c9c10f48a8eba6795ecec7023
parent 2ae2d77cfa424587014cb34a89eed0ff2149fd5c
author Linus Torvalds <torvalds@g5.osdl.org> 1124402301 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1124402301 -0700

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