[illumos-gate merge]

commit fb4cdc19f4c1650a26fa4b7f4faf5a036225c7d4
    8828 udapl: value computed is not used
commit 4432e6b4ec7a3cb1a2915b65a8daae5faa278ba0
    8853 libsocket: variable 'addr' set but not used
commit 9c88ac3ab4edaa5e8c0130ed1b4b376ea57c545a
    8852 libcurses: local unused types
commit 712a34becd0c378dd87ef9106ed5275739e2521a
    8844 libdns_sd: variable set but not used
commit e8dc66e7692c9d61c165fa302f0d05e86ffaced9
    8841 smhba: variable 'status' set but not used
commit 6cfe4330282a218c2e13a305e7fecc048518aad1
    8833 libcmd: variable 'ep' set but not used
commit f362c74cdda7b4819bb5d3360149ac0fae9ea013
    8774 kadmin/dbutil: variable 'crflags' set but not used
commit 96b6509c49b81cb0d89ec222d92d421d946caa0c
    8735 libld: variable '_vdp' set but not used
commit 1f0c5e612d8dfd7d1a8f4487cef753357b9909f5
    8702 PCI addresses with physaddr > 0xffffffff can't be mapped in
    8703 pci/npe DDI_CTLOPS_REGSIZE should be 64-bit aware
    8704 want OFF_MAX in the kernel
    8705 unsupported 64-bit prefetch memory on pci-pci bridge
commit 458f44a49dc56cd17a39815122214e7a1b4793e3
    8849 libresolv2: remove rcsid
commit 6c6e04f2699a6755d7a29e6fc1679b292600616c
    8875 loader.efi: efipart should exclude iPXE stub block protocol
commit 862246c1516ca78c11bef09650987f3d7171b2c9
    8854 libm: variable set but not used
commit e34d2eb7802a6af2e2219818b08b2c2ac88a1c81
    8839 madv: error: variable 'rc' set but not used
commit 13ddffeef026c03c1ddee21119335c00d6b7f3ae
    8827 libldap5: variable set but not used

	Conflicts:
	usr/src/uts/i86pc/io/rootnex.c

0 files changed, 0 insertions, 0 deletions