[illumos-gate merge]

commit 2952f70a6a70b04a459a24166d796cdf2f629ed8
    10799 i86xpv: NULL pointer errors
commit a2d4e26a43f10718fe33e47fa968a3fdf901e156
    10798 xpv: NULL pointer errors
commit dba471f4100e039b518abed314526d822234f8cc
    10800 evtchn: NULL pointer errors
commit 6be20e18a2e738d2d7d3066ece3a4e71045ea88e
    10801 xencons: NULL pointer errors
commit 73ef9f27279e31544655b04979f4f648d8575476
    10802 xenbus: NULL pointer errors
commit aabaa37a39655f3a4bc4cb0c5d7d9ad5927c3323
    10803 xnbo: NULL pointer errors
commit 3e1e1e62b0c0f0f7b5ebf7025cfa7f3e715f7cee
    10715 ohci: NULL pointer errors
commit f274e1d7606d204f203c8eb43894e5190ba0ff88
    10764 drm: NULL pointer errors
commit 172f446568dc0e4c9967aa7fc2e0810a0c6beab3
    10696 loader: use zlib-1.2.11
commit b83829353d4a26013e3ab27abdaadbf8ea060738
    10695 import zlib-1.2.11
commit 555d674d5d4b8191dc83723188349d28278b2431
    10592 misc. metaslab and vdev related ZoL bug fixes
commit 9491604f9b9066cbbf235d3ce5a2a9f84e682bc4
    10743 loader: zfsboot.c inconsistent indenting
commit 1a18250823b44e2190da89fc4551f4cbccb7bbb9
    10750 s1394: NULL pointer errors
commit 25c95769d03db2f91662020bcbc62b7aa59a7642
    10749 rpcmod: NULL pointer errors
commit a7b185437a085b630720929592f091c604f4986b
    10748 usbms: NULL pointer errors
commit 5300f7b31236679926392a1a0539c44241b251e6
    10747 timod: NULL pointer errors
commit c86160f040741e2e6312538e07eaa97b5053c172
    10746 telmod: NULL pointer errors
commit 34b7c4d5ed09dce871320048afc0504a83418744
    10742 FX: NULL pointer errors
commit 060425259041d96430b4b9497b0800baf07821ce
    10740 udfs: NULL pointer errors
commit 1f563eb1bb0d55d75f9ec2c3776a1ca277707ec4
    10741 ufs: NULL pointer errors
commit e14d4b22a4af406b3202d81ab8a3a197b796bcd2
    10737 procfs: NULL pointer errors
commit 80a3d255988c2133ae94f26127fbbfdd9d9ed620
    10735 pcfs: NULL pointer errors
commit 814e7298d2cac68e7d15905df9bcb7dde9175811
    10729 dev: NULL pointer errors
commit 0b63ccaf46184148daa5151621b2db6c62d1c305
    10728 hermon: NULL pointer errors
commit 6e20df6b5d4d0fa57c9187ddce3e1eb870a854e6
    10727 tavor: NULL pointer errors
commit d2a0120188ab7ddc6ec530e02b2fb3770b886f11
    10725 sol_ucma: NULL pointer errors
commit e40570dd557d185d2eef1f1970de92ae17fd6cb0
    10724 daplt: NULL pointer errors
commit d70bcb7258b79267aad36309c42fd499e844458f
    10720 iser: NULL pointer errors
commit 92548b6ca1ae8b76e54b19801f96b5f6eb4e836d
    10718 av1394: NULL pointer errors
commit 485f90e999c14cf930437352b290676f9e89aa60
    10717 usbgem: NULL pointer errors
commit fbcf87a4562106add38912a718bcd42a9e2c479f
    10713 fp: NULL pointer errors
commit 811eca55ab39bdff2ebf68281580720b7732dd51
    10712 iscsi: NULL pointer errors
commit 6aef9e114370e9ace5c935c37c897ea7800dff77
    10711 ehci: NULL pointer errors
commit 7a31d868f4fe5807fc1f2c366518428c223128ef
    10657 ksslf: NULL pointer errors
commit 4e40636a684e148425f364361983709c35489c98
    10710 scsi_vhci: NULL pointer errors
commit ceedf1248cb119d3359e4da0775d4d136b298408
    10688 gfx_private needs smatch fixes
commit 66feb664522a4aab90b9adec2e8c408b6da7ee17
    10730 dprov: NULL pointer errors
commit 30df210350904179c6f4c809c371bbb1319e3b6c
    10734 tmpfs: NULL pointer errors
commit ae367b8415e0f719fb9a789c8748c9000a881989
    10661 qlt: NULL pointer errors
commit d4a54bf774f1986f61246b1ae5d84a724df14396
    10589 wscons: slow console oputput will trigger keyboard autorepeat
commit ecc592dc1b98ac0a4ff8d835d90e876a845816f8
    10789 md5: NULL pointer errors
commit 1769ed96fc4e53d756a18c13134b3eb443ef4882
    10788 sha1: NULL pointer errors
commit b4a44cf294b47530f872176be732538fdf3536a0
    10787 rsa: NULL pointer errors
commit b5083b9a5647bb410e5d88172c7d6cadea069cba
    10786 md4: NULL pointer errors
commit 3ec36537a18a5cb5e8a31eca1ea311e033993317
    10785 ecc: NULL pointer errors
commit 8a292154575f4abb5521e31d3d38117a6a3d077f
    10784 aes: NULL pointer errors
commit aec38f6c97c95597ac7ffeb7fa6a5f47fda59410
    10783 des: NULL pointer errors
commit c8b1c8bdff5c74b45e33257ed7499ca0f475ebe0
    10782 blowfish: NULL pointer errors
commit c4fd2a7748785a8c83d6e34d2d80dd5703690998
    10781 arcfour: NULL pointer errors
commit e6915ea4a84088ff77aeac34866dda0a8d2cf632
    10780 scsi: NULL pointer errors
commit cdcfeaaebb9c28e15c04ff4d1f19261edfd9ed60
    10779 usba: NULL pointer errors
commit 32b17656b54efc6d9df4806aebdde39ea6f5cb4f
    10777 pci_autoconfig: NULL pointer errors
commit ad2568571a9e0fa82fbc020b1a971ac51dc4dad0
    10776 nfs_dlboot: NULL pointer errors
commit 49ee6bfbbe326d1f0bbc34934ab8b07a000305c4
    10797 npe: NULL pointer errors
commit c91bd91c0a8eda47d54422d3c3bf96241e43b582
    10796 pcplusmp: NULL pointer errors
commit f44210608f03909f70d6783d19f164519baf1085
    10767 ipc: NULL pointer errors

	Conflicts:
	usr/src/uts/common/fs/zfs/metaslab.c

0 files changed, 0 insertions, 0 deletions