From 9d03d9b77c49fb492399b587cc44b5b3db56d459 Mon Sep 17 00:00:00 2001
From: eadler <eadler@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 17 Nov 2011 14:06:39 +0000
Subject: [PATCH] Record the merge of r227457, which was done as part of
 r227565 but not mentioned in the commit log

PR:		kern/142999
PR:		kern/151365
Submitted by:	Takefu Kenji <takefu@airport.fm>
Submitted by:	Joerg Niendorf <f5d10a@internode.on.net>
Approved by:	re (kib)


git-svn-id: svn://svn.freebsd.org/base/releng/9.0@227625 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
-- 
2.42.0