tree 0c54ee48fa3c9a47cdb82fc29f8632c376790c8a
parent 668e4bc7229c1866f65f3bef6ab011f8c9034089
parent e172577da02cde3916e75406b314e6f01c228a5c
author Linus Torvalds <torvalds@g5.osdl.org> 1126715734 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1126715734 -0700

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