tree 46183aec3aee554af35398057d5da1b632b3d507
parent 8be3de3fd8469154a2b3e18a4712032dac5b4a53
parent 910313aa1db1b0c63ee9684bb4f35c17e7192f43
author Linus Torvalds <torvalds@ppc970.osdl.org> 1117898319 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> 1117898319 -0700

Automatic merge of 'misc-fixes' branch from

	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6