]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
Undo bad merge.
authorrodrigc <rodrigc@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Mon, 23 Jun 2014 22:35:41 +0000 (22:35 +0000)
committerrodrigc <rodrigc@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Mon, 23 Jun 2014 22:35:41 +0000 (22:35 +0000)
commitf81623979cbc9aca5fcb0d4004ebb28371949a55
tree20e216fb76e7e6548e699e6a150ad8e1170c241b
parentf7e99e65663b5f71f16e68c7252cc4fac9d2dcbc
Undo bad merge.

git-svn-id: svn://svn.freebsd.org/base/stable/10@267808 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sbin/mount_nullfs/mount_nullfs.c
sys/x86/acpica/madt.c