[illumos-gate merge]

commit e2c88f0c2610f16de7b639746b40dea5f3e2256e
    5832 EOF wireless usb (aka UWB)
commit eba03e8e19855a13cb54c87ad0767659a673b834
    5801 nuke big file scanner (bfs)
commit 403aa8eca43fa3e4e59c280724e47bd18f2051bc
    3842 remove the machid commands (fix copyrights)

	Conflicts:
	usr/src/uts/common/Makefile.rules

1 files changed, 0 insertions, 24 deletions

diff --git a/manifest b/manifest
index 629df2c28c..487848cf23 100644
--- a/manifest
+++ b/manifest
@@ -603,8 +603,6 @@ f kernel/drv/amd64/fp 0755 root sys
 f kernel/drv/amd64/heci 0755 root sys
 f kernel/drv/amd64/hid 0755 root sys
 f kernel/drv/amd64/hubd 0755 root sys
-f kernel/drv/amd64/hwahc 0755 root sys
-f kernel/drv/amd64/hwarc 0755 root sys
 f kernel/drv/amd64/hxge 0755 root sys
 f kernel/drv/amd64/i8042 0755 root sys
 f kernel/drv/amd64/icmp 0755 root sys
@@ -980,7 +978,6 @@ f kernel/misc/amd64/gsqueue 0755 root sys
 f kernel/misc/amd64/hidparser 0755 root sys
 f kernel/misc/amd64/hook 0755 root sys
 f kernel/misc/amd64/hpcsvc 0755 root sys
-f kernel/misc/amd64/hwa1480_fw 0755 root sys
 f kernel/misc/amd64/idm 0755 root sys
 f kernel/misc/amd64/idmap 0755 root sys
 f kernel/misc/amd64/iommulib 0755 root sys
@@ -1719,7 +1716,6 @@ f lib/svc/method/svc-tnd 0555 root sys
 f lib/svc/method/svc-utmpd 0555 root bin
 f lib/svc/method/svc-varpd 0555 root sys
 f lib/svc/method/svc-vrrp 0555 root sys
-f lib/svc/method/svc-wusb 0555 root sys
 f lib/svc/method/svc-zones 0555 root sys
 f lib/svc/method/system-log 0555 root bin
 f lib/svc/method/vtdaemon 0555 root bin
@@ -1876,7 +1872,6 @@ f sbin/uadmin 0555 root sys
 f sbin/umount 0555 root bin
 f sbin/umountall 0555 root sys
 f sbin/uname 0555 root bin
-f sbin/wusbadm 0555 root bin
 f sbin/zfs 0555 root bin
 f sbin/zonename 0555 root bin
 f sbin/zpool 0555 root bin
@@ -1963,7 +1958,6 @@ f usr/bin/basename 0555 root bin
 f usr/bin/batch 0555 root bin
 f usr/bin/bc 0555 root bin
 f usr/bin/bdiff 0755 root bin
-f usr/bin/bfs 0555 root bin
 h usr/bin/bg=usr/bin/alias
 f usr/bin/busstat 0555 root bin
 f usr/bin/cal 0555 root bin
@@ -4365,8 +4359,6 @@ d usr/include/sys/usb/clients/audio 0755 root bin
 f usr/include/sys/usb/clients/audio/usb_audio.h 0644 root bin
 d usr/include/sys/usb/clients/hid 0755 root bin
 f usr/include/sys/usb/clients/hid/hid.h 0644 root bin
-d usr/include/sys/usb/clients/hwarc 0755 root bin
-f usr/include/sys/usb/clients/hwarc/hwarc.h 0644 root bin
 d usr/include/sys/usb/clients/mass_storage 0755 root bin
 f usr/include/sys/usb/clients/mass_storage/usb_bulkonly.h 0644 root bin
 f usr/include/sys/usb/clients/mass_storage/usb_cbi.h 0644 root bin
@@ -4395,11 +4387,6 @@ f usr/include/sys/utrap.h 0644 root bin
 f usr/include/sys/utsname.h 0644 root bin
 f usr/include/sys/utssys.h 0644 root bin
 f usr/include/sys/uuid.h 0644 root bin
-d usr/include/sys/uwb 0755 root bin
-f usr/include/sys/uwb/uwb.h 0644 root bin
-d usr/include/sys/uwb/uwba 0755 root bin
-f usr/include/sys/uwb/uwba/uwba.h 0644 root bin
-f usr/include/sys/uwb/uwbai.h 0644 root bin
 f usr/include/sys/va_impl.h 0644 root bin
 f usr/include/sys/va_list.h 0644 root bin
 f usr/include/sys/var.h 0644 root bin
@@ -10108,7 +10095,6 @@ f usr/lib/vtdaemon 0555 root bin
 f usr/lib/vtinfo 0555 root bin
 f usr/lib/vtxlock 0555 root bin
 f usr/lib/watchmalloc.so.1 0755 root bin
-s usr/lib/wusbd=../../sbin/wusbadm
 d usr/lib/zfs 0755 root bin
 f usr/lib/zfs/availdevs 0555 root bin
 d usr/lib/zones 0755 root bin
@@ -10553,7 +10539,6 @@ f usr/sbin/volcopy 0555 root bin
 f usr/sbin/vrrpadm 0555 root bin
 f usr/sbin/wall 2555 root tty
 h usr/sbin/whodo=usr/lib/isaexec
-s usr/sbin/wusbadm=../../sbin/wusbadm
 f usr/sbin/ypalias 0555 root bin
 f usr/sbin/ypinit 0555 root bin
 f usr/sbin/yppoll 0555 root bin
@@ -11442,7 +11427,6 @@ f usr/share/man/man1/basename.1 0444 root bin
 s usr/share/man/man1/batch.1=at.1
 f usr/share/man/man1/bc.1 0444 root bin
 f usr/share/man/man1/bdiff.1 0444 root bin
-f usr/share/man/man1/bfs.1 0444 root bin
 s usr/share/man/man1/bg.1=jobs.1
 f usr/share/man/man1/cal.1 0444 root bin
 f usr/share/man/man1/calendar.1 0444 root bin
@@ -12228,7 +12212,6 @@ f usr/share/man/man1m/volcopy_ufs.1m 0444 root bin
 f usr/share/man/man1m/wall.1m 0444 root bin
 f usr/share/man/man1m/whodo.1m 0444 root bin
 f usr/share/man/man1m/wracct.1m 0444 root bin
-f usr/share/man/man1m/wusbadm.1m 0444 root bin
 f usr/share/man/man1m/ypinit.1m 0444 root bin
 f usr/share/man/man1m/yppoll.1m 0444 root bin
 f usr/share/man/man1m/ypset.1m 0444 root bin
@@ -18414,9 +18397,6 @@ f usr/share/man/man7d/hci1394.7d 0444 root bin
 f usr/share/man/man7d/heci.7d 0444 root bin
 f usr/share/man/man7d/hid.7d 0444 root bin
 f usr/share/man/man7d/hubd.7d 0444 root bin
-s usr/share/man/man7d/hwa1480_fw.7d=wusb_df.7d
-f usr/share/man/man7d/hwahc.7d 0444 root bin
-f usr/share/man/man7d/hwarc.7d 0444 root bin
 f usr/share/man/man7d/hxge.7d 0444 root bin
 f usr/share/man/man7d/ieee1394.7d 0444 root bin
 f usr/share/man/man7d/igb.7d 0444 root bin
@@ -18499,15 +18479,11 @@ f usr/share/man/man7d/usbftdi.7d 0444 root bin
 f usr/share/man/man7d/usbsacm.7d 0444 root bin
 f usr/share/man/man7d/usbsksp.7d 0444 root bin
 f usr/share/man/man7d/usbsprl.7d 0444 root bin
-s usr/share/man/man7d/uwb.7d=uwba.7d
-f usr/share/man/man7d/uwba.7d 0444 root bin
 f usr/share/man/man7d/virtualkm.7d 0444 root bin
 f usr/share/man/man7d/vni.7d 0444 root bin
 f usr/share/man/man7d/vr.7d 0444 root bin
 f usr/share/man/man7d/vnd.7d 0444 root bin
 f usr/share/man/man7d/wscons.7d 0444 root bin
-f usr/share/man/man7d/wusb_ca.7d 0444 root bin
-f usr/share/man/man7d/wusb_df.7d 0444 root bin
 f usr/share/man/man7d/xge.7d 0444 root bin
 f usr/share/man/man7d/yge.7d 0444 root bin
 f usr/share/man/man7d/zcons.7d 0444 root bin