[clearview-dev] /export/ws/clearview/clearview-ipobs: fix minor auto-merge issues

[sebastien....@sun.com]

Author:    Sebastien Roy <Sebastien.Roy at Sun.COM>
Changeset: 8170:bc83fec06c31
Comments:
fix minor auto-merge issues

Files:
usr/src/uts/common/Makefile.rules usr/src/uts/common/inet/tcp.h