PERFORCE change 168800 for review

[Alexander Motin]

http://perforce.freebsd.org/chv.cgi?CH=168800

Change 168800 by mav at mav_mavbook on 2009/09/22 22:28:20

	Fix missed conflict resolve.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#22 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#22 (text+ko) ====

@@ -24,13 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ahci/ahci.h#1
- * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.1 2009/07/10 08:18:08 scottl Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/ahci/ahci.h#2
  * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.2 2009/08/30 15:20:13 mav Exp $
-==== YOURS //mav_mavbook/scottl-camlock/src/sys/dev/ahci/ahci.h
- * $FreeBSD$
-<<<<
  */
 
 /* ATA register defines */