gitweb.dragonflybsd.org Git - dragonfly.git/commit

profmakx's projects / dragonfly.git / commit

author	Markus Pfeiffer <markus.pfeiffer@morphism.de>
	Wed, 15 Aug 2012 18:46:28 +0000 (18:46 +0000)
committer	Markus Pfeiffer <markus.pfeiffer@morphism.de>
	Wed, 15 Aug 2012 18:46:28 +0000 (18:46 +0000)
commit	1980cb6ea09128d9943f2878c153ff67503f2d8d
tree	a8e9473108dd5850b5e762b5f6c9511293d339c8	tree \| snapshot
parent	9d1692ad24c38561d5181fff115f77f8b40b08ba	commit \| diff
parent	33d45f3f995e6e60aa55266a84b641abfbade498	commit \| diff

Merge usb patch into current master.

Conflicts:
sys/dev/netif/Makefile
sys/dev/netif/axe/if_axe.c
sys/dev/netif/mii_layer/mii.c
sys/dev/netif/mii_layer/truephy.c
sys/dev/usbmisc/ukbd/ukbd.c
sys/dev/usbmisc/umass/umass.c
sys/platform/pc64/x86_64/busdma_machdep.c
sys/sys/bus_dma.h

profmakx's DragonFly repo

RSS Atom

sys/bus/pci/pcireg.h	diff1 \|	diff2 \|	blob \| history
sys/conf/files	diff1 \|	diff2 \|	blob \| history
sys/conf/kmod.mk	diff1 \|	diff2 \|	blob \| history
sys/config/X86_64_GENERIC	diff1 \|	diff2 \|	blob \| history
sys/dev/netif/mii_layer/mii.c	diff1 \|	diff2 \|	blob \| history
sys/dev/netif/mii_layer/mii_physubr.c	diff1 \|	diff2 \|	blob \| history
sys/dev/netif/mii_layer/truephy.c	diff1 \|	diff2 \|	blob \| history
sys/platform/pc64/x86_64/busdma_machdep.c	diff1 \|	diff2 \|	blob \| history