tree 5bb92477b811e64e88c9f0c119acb2c9e9804c91
parent e494f6333bef20fd9d8689062260c5d0136a3ea0
parent e254e9bff5283aad1af6d74d2a312ee011b84d61
author Linus Torvalds <torvalds@ppc970.osdl.org> 1119909350 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> 1119909350 -0700

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