Merge branch 'master' into kq_devices
authorSamuel J. Greear <sjg@thesjg.com>
Mon, 12 Jul 2010 03:38:36 +0000 (03:38 +0000)
committerSamuel J. Greear <sjg@thesjg.com>
Mon, 12 Jul 2010 03:38:36 +0000 (03:38 +0000)
commit670c949e1321027348d49d2a805f3dc995341bab
tree2d375e5847fa3e0f000077c97642b14d5c5e7b96
parent8b5c39bbafa92d9c4cc0bb75ed2cf5ab4316f2aa
parent0e132b2a144870b3a91bf2e44758335d383032f9
Merge branch 'master' into kq_devices
sys/dev/raid/vinum/vinum.c
sys/kern/kern_udev.c