Index: stable/9/sys/dev =================================================================== --- stable/9/sys/dev (revision 304660) +++ stable/9/sys/dev (revision 304661) Property changes on: stable/9/sys/dev ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,15 +0,0 ## Reverse-merged /projects/multi-fibv6/head/sys/dev:r230929-231848 Reverse-merged /stable/10/sys/dev:r265922,281954,292975,299623,299630,299632,299635,299695 Reverse-merged /projects/cambria/sys/dev:r186008-186350 Reverse-merged /projects/head_mfi/sys/dev:r227068,227574,227579-227580,227612,227905,228108,228208,228279,228310,228320,231988,232412-232414,232888,233016,233620 Reverse-merged /user/piso/ipfw/sys/dev:r190918,190921,190923,190926 Reverse-merged /user/dfr/xenhvm/6/sys/dev:r189304,189451 Reverse-merged /user/dfr/xenhvm/7/sys/dev:r188574-189614 Reverse-merged /user/peter/kinfo/sys/dev:r185413-185547 Reverse-merged /projects/quota64/sys/dev:r184125-207707 Reverse-merged /user/piso/sys/dev:r186543,186723,186725-186726,186742,186770-186771,186774,186777-186779,187984-187985,190555,190572,190589,190592,190614,190625,190830 Reverse-merged /head/sys/dev:r225777,225788-225789,225791,225793-225794,225837-225841,225843,225856,225869,225875,225877-225878,225882,225885-225891,225894,225899-225901,225931-225932,225938,225940-225944,225946-225947,225950,225953,225955,225973,225981,226022,226026,226029,226034,226039-226042,226054,226057,226060,226064-226065,226068-226069,226071-226074,226078-226079,226081-226082,226095,226099,226104,226112-226114,226116-226118,226120,226123,226143,226146,226149,226154,226163,226165,226168,226171,226173,226175-226176,226179,226181-226183,226185,226203,226208,226219,226221-226222,226224,226247,226252-226253,226270,226294,226302,226318,226324,226338,226340,226346,226350,226364,226367,226381,226398,226401-226402,226404,226406,226410,226436,226442,226446,226449,226451,226453,226465,226467,226476,226478-226481,226483,226510,226512,226514,226522,226526-226527,226530-226536,226544,226547,226549-226554,226568-226569,226609-226610,226617,226620,226623,226642,226647,226655-226656,226660-226663,226673,226676,226678-226681,226686-226688,226695-226696,226699-226701,226707,226709-226710,226713,226724,226732,226740,226743,226746,226748-226749,226770,226793,226803-226807,226814-226816,226820-226821,226829-226831,226843,226863-226864,226866-226872,226880,226882,226887,226896,226903,226938,226947-226950,226967,226971,226985-226987,226995,227000-227001,227006,227042-227043,227055,227058-227059,227061-227062,227064,227069-227070,227075,227085-227089,227091-227095,227098-227099,227102-227104,227108,227110-227111,227126,227204,227206-227207,227266,227284-227285,227290-227291,227293,227308-227312,227316,227318-227320,227322-227324,227341-227342,227347,227367,227383,227389,227392-227394,227396,227399,227401,227409,227430-227432,227442-227444,227447,227449,227452,227457-227458,227460-227464,227481,227485-227486,227489,227493-227494,227502,227505,227507,227509,227512,227517,227527,227529-227530,227532,227535,227537,227539-227541,227543,227547-227548,227550,227562,227569,227576-227578,227582,227587,227590-227591,227593,227610,227626,227629,227635,227637-227642,227652,227654-227657,227662,227674-227675,227685-227688,227690,227695-227697,227699-227701,227706,227730,227743-227744,227748-227749,227751,227755,227758-227760,227781,227785,227788,227790,227796,227802,227805,227814,227816-227817,227822-227823,227827-227829,227833-227837,227842-227843,227847-227851,227854,227874,227906-227908,227912-227914,227916,227930-227931,227952,227954-227955,227960,227980,227992,228005,228016,228021-228022,228024,228026-228027,228029-228031,228046,228061,228076,228078,228084-228086,228089,228102-228104,228133,228150,228161,228178,228185,228195,228198,228200,228207,228209,228211,228217-228222,228232-228234,228243,228260,228263-228268,228270,228277,228286,228288,228290-228293,228297-228298,228301-228304,228306,228317,228321-228322,228324-228327,228330-228333,228335-228336,228343-228344,228360-228363,228368-228369,228376,228381,228391-228392,228398,228412-228413,228424,228426,228430-228434,228436,228438,228440-228445,228448,228461,228470,228476-228477,228479-228480,228483-228485,228491,228493-228497,228502,228504,228507-228510,228526,228530,228533,228539,228554,228556,228560-228562,228564,228567-228569,228572,228583,228593,228621,228631-228634,228637-228638,228640,228642-228644,228648,228653,228666,228687-228689,228709-228711,228715-228718,228723,228726-228727,228732,228738,228746,228757-228758,228760,228765,228767,228779,228781,228783,228789,228793,228802,228805,228808,228811,228813-228820,228822,228825,228827,228838,228841,228846-228847,228849,228851,228855,228858-228861,228865-228869,228874,228897,228907,228914,228916,228923,228935,228940,228947,228957,228960-228963,228966-228967,228971,228978-228980,228985,228994,229003-229004,229007,229067,229076,229085-229086,229104,229127,229185,229211,229276,229284,229288,229317,229353,229363,229375,229390,229395,229400-229402,229414,229416,229420,229423,229425,229427-229431,229435,229462-229463,229465,229469-229470,229476-229477,229479,229495,229519,229533,229537,229546-229547,229574,229598,229600,229613-229614,229621-229622,229665,229671-229672,229692,229694,229700,229714,229727-229729,229753,229771,229773-229775,229777,229795,229802,229805,229828,229849-229854,229857,229881,229886-229887,229898,229934,229940,229956,229959,229961-229965,229971,229976,229980-229981,229984,229997,230000,230032-230033,230035,230050,230063-230064,230090-230091,230100-230101,230104,230108-230109,230123,230129-230130,230135-230136,230138-230139,230143-230145,230157,230179,230181,230183-230185,230200,230204,230209,230213,230238,230242,230247,230249-230250,230256,230260-230262,230269-230270,230275-230277,230286,230312-230313,230316,230323,230325-230327,230331,230333-230334,230336-230338,230340-230341,230345,230379,230387,230394,230397-230398,230401,230407,230426,230429,230438,230441,230451,230459,230465,230470,230480,230486-230489,230494,230496,230506-230507,230510-230511,230513,230531-230532,230537-230538,230544-230545,230547,230550-230554,230571,230574,230585,230587-230588,230590,230592,230602,230605,230620,230627-230628,230630-230634,230636,230641,230643,230662,230664,230765-230766,230768,230774-230775,230777-230778,230782-230783,230785,230801,230803,230807,230822,230830,230843,230845,230857,230861,230864-230866,230877,230897-230898,230912,230915-230916,230921,230957-230958,230972,230980-230981,230984,230992-230995,230999,231003,231006,231012,231024-231026,231046,231074-231077,231091-231092,231115-231116,231118,231120,231122,231130,231133-231134,231136-231137,231149,231159-231161,231168-231169,231172,231175,231177,231204,231226-231228,231240,231265-231267,231269,231273,231295-231296,231313,231317,231320,231349,231367,231378,231387,231441,231474,231485,231505,231518,231520-231521,231526,231543,231558-231559,231565,231572-231573,231585,231589,231592,231617,231621-231622,231647,231672,231713,231716,231743,231745,231751,231754,231760-231761,231764-231766,231770,231781,231787,231791,231797,231805,231810,231814,231823,231830-231831,231837,231839-231843,231852,231860,231879,231883,231885,231895,231904,231908,231913-231914,231928-231929,231949,231975-231976,231982,231985,231991,231998,232002-232003,232008,232014-232016,232019,232021,232025,232027,232029-232031,232039-232040,232048,232050,232059,232061,232063,232065,232069-232071,232074,232080,232103-232104,232116,232118,232127,232143,232145,232152,232157-232158,232166,232176-232179,232181,232186,232207,232218,232225,232228,232240,232246,232250,232257,232263,232265,232267,232278,232296,232299,232301,232303-232305,232307,232309,232315,232317,232322,232327,232337,232351,232358,232360-232361,232365-232367,232380,232383,232401,232403,232411,232416,232420,232448,232454-232455,232467,232470,232477,232487,232493-232495,232506,232512,232517-232518,232539,232541,232561,232570,232612,232614,232629,232639-232640,232667-232669,232675,232684-232685,232700,232702-232703,232709,232717,232723-232724,232726,232742,232744-232745,232747,232754,232776,232783-232784,232793,232797,232799,232822,232828,232833-232837,232848-232850,232852,232854,232860,232865-232866,232868,232874,232882-232883,232886,232917,232919,232921,232933,232947-232948,232951,232953,232959-232960,232967,232975,232980,232990-232991,233000,233004-233005,233011,233017-233018,233031,233040,233042,233045,233054,233056,233096-233097,233100-233101,233105,233113,233117,233126,233135,233158,233168,233175-233178,233181,233187,233191,233198,233208,233230,233236,233249,233256,233272-233274,233276,233282-233284,233287,233291,233305,233311,233313,233323,233342,233354,233362,233371,233387,233389,233403-233404,233421,233423,233425,233427,233434,233436,233438,233454,233465,233478,233529-233530,233544,233547,233554,233567,233571,233575,233579-233580,233585-233587,233597,233606-233610,233613,233618-233619,233622-233623,233627-233629,233635,233651-233652,233660,233662-233663,233666,233670-233671,233675-233678,233688-233689,233692,233701-233702,233704,233709-233711,233713,233746-233748,233760,233768,233771,233774,233781,233787,233793,233805,233808-233809,233817,233827,233870,233872,233875,233877,233886,233888,233893,233912,233918,233925,233939-233940,233948-233949,233957,233961,233964,233998-234000,234024-234026,234038-234040,234043,234059,234074,234098-234099,234104-234106,234115,234121,234131,234139,234149,234152,234155-234158,234163,234172,234176,234182-234183,234186,234190,234196,234207-234208,234233,234247-234248,234270,234280-234281,234291-234293,234296-234297,234302-234303,234321,234325,234337-234339,234342,234348-234350,234386,234400,234403,234414-234415,234417-234418,234421,234441,234443,234459-234461,234464,234482-234483,234487-234489,234494,234501,234503,234506-234507,234517,234524,234539-234542,234554,234556,234560-234561,234564,234572,234574,234576,234589,234598,234601,234614-234617,234643,234699,234723,234731,234740,234742,234762,234789,234803,234821,234831-234833,234867,234897-234898,234901,234930,234932,234936,234944,234951-234952,234957,234961,234981,234989,234995-234996,235009,235014,235016,235021,235024,235029,235040,235043,235052,235057,235064,235066,235069,235075,235077,235081,235091,235099,235119,235144,235147,235151,235153-235156,235158,235201,235207,235210,235219,235229,235231-235233,235241,235246,235255,235264,235280,235282-235283,235318,235321,235329-235330,235332-235333,235343,235348,235361,235364,235381,235390-235391,235394-235395,235419,235451,235510,235556,235558,235563,235568-235569,235610,235619,235634,235678,235681,235684,235686-235687,235692,235751,235772,235782-235783,235816,235821,235829,235831,235833-235834,235845-235846,235925,235944,235963,236061-236063,236069-236070,236073,236156,236178,236182-236184,236191,236212,236220-236221,236242,236245-236246,236282,236323,236328,236371,236377,236379,236403-236408,236427,236439,236486,236488-236489,236491,236495-236497,236503,236579,236581,236592,236649,236666,236670,236700,236736-236737,236825,236847,236916,236937,236952,236997,237008,237079,237101-237102,237107,237131,237135,237178,237196-237197,237200,237203,237210,237223,237236,237239,237244,237271-237272,237274,237295,237322,237334,237338,237350,237357,237411,237436,237439,237460,237463,237480,237484,237493,237512,237518,237537,237544,237546-237547,237587,237601,237647,237649,237673,237683,237718,237734-237736,237799-237800,237819,237831-237832,237842,237852,237975,238000,238011,238015,238022,238028,238054,238072,238077-238079,238109,238142,238148-238149,238151,238164,238166,238172,238179,238192-238194,238199,238201,238203,238214,238229,238274,238310-238311,238313,238360,238366,238371,238373,238418,238424,238466,238486,238493,238502,238526,238529,238551,238574,238601,238621,238666,238673,238717-238718,238766,238778-238779,238803-238804,238806,238851,238869,238887,238933,238943,238954,238969,238991,238997,239008,239010,239012,239020,239023,239037-239038,239046,239050,239055,239065,239076,239079,239084,239089,239103,239110,239128,239140-239141,239143,239179-239182,239218-239219,239234,239237,239242,239244,239254,239257-239260,239266,239298-239299,239303,239326,239330,239336,239338-239339,239341,239344,239358,239375,239502,239511,239514,239527-239528,239544-239545,239567,239584,239617,239665,239673,239771,239779,239864,239889,239907-239908,239913,240078-240079,240118,240135,240137,240164,240203,240209-240210,240219,240286,240289,240382-240383,240430,240443,240452-240453,240455,240466,240475,240514,240518,240520-240521,240589-240590,240597,240609,240615-240616,240634,240650,240671-240672,240680,240683,240692,240694-240695,240697,240699-240700,240720,240739,240743,240750,240856,240879,240884,240900-240901,240917,240923-240924,240962,240968,240981,240990,240992,241027,241037,241082,241144-241145,241160,241215-241216,241219-241220,241228,241340-241341,241343,241375,241388-241393,241397-241399,241402,241409,241432-241434,241436-241438,241469-241470,241492-241495,241537-241538,241551-241553,241555,241588-241590,241592-241593,241603,241605,241611,241626,241642-241643,241657-241665,241679,241689,241733,241738,241741,241748,241753,241759,241793,241843-241844,241858,241874-241875,241917,241974,241983-241985,241987-241988,242086-242088,242126-242127,242129,242137,242156,242223,242305,242348,242352,242357,242364,242417,242420,242422,242425-242426,242438,242453,242455,242458,242467,242479-242480,242497,242523,242529,242565,242583,242619,242625,242628,242666,242671,242681,242695,242702-242703,242726,242744,242748,242777,242814,242823,242827,242871,242873,242889,242906,242922,242996,243000,243037,243078,243110,243333,243372-243373,243380,243387,243404,243624,243663,243680-243681,243686,243760-243761,243780,243793-243794,243857,243904,243951,244027,244047,244114,244136,244145-244146,244200,244280,244341,244369,244405-244406,244410-244411,244413,244481-244482,244489,244491,244503,244535,244549,244551,244567,244580,244607,244650,244695,244719,244750,244752,244781,244787,244837,244980-244981,244983,244990-244991,244993,245047,245132,245136,245175,245243,245248-245249,245263,245266,245274,245276,245297,245314-245315,245328,245427,245434,245441,245446,245448,245459,245467-245468,245471,245517-245518,245567,245647,245725,245768,245867,245870,245875,245923,245926,245931,245933,245935-245937,245947,245952,245976,245995,246016,246021,246037,246093,246113,246126,246166,246243,246250-246252,246257,246289,246300,246341,246360,246385,246397,246421,246454,246482,246565,246575,246614,246616,246713,246753,246759,246765,246789,246799,246876-246877,246944,246951,247011,247062,247122,247133,247151-247152,247159-247160,247165,247255,247264,247266,247268,247279,247289,247291,247329,247332,247334,247347,247355,247367,247369,247382,247426,247443,247565,247570-247571,247579,247590-247591,247594,247632,247815,247829,247832-247836,247838-247839,247848-247849,247880,247910-247911,247963,248059-248061,248175,248187,248226-248227,248246,248254,248340,248456,248458,248472,248478-248479,248499,248518,248522,248542,248566,248583,248627,248657,248661,248663,248666,248687,248698,248704-248705,248729-248741,248746-248749,248754-248771,248773,248775,248778,248780,248799,248824-248826,248834-248835,248842,248913,248925,248933,248977,248993,249032,249039,249041,249052,249062,249069-249070,249096,249170,249199,249203-249204,249213,249249,249257,249315,249336,249346,249349,249370,249376,249382-249383,249385,249391-249393,249416-249422,249468,249476,249622,249627,249629,249631,249725,249767,249795-249796,249803,249815,249830,249844-249845,249849,249908,249947,249977,250022,250031,250050,250053,250088,250090,250092-250093,250117,250185,250201,250206,250218,250221,250286,250418,250460,250576,250614,250661,250697,250740,250763,250765,250792,250797,250848,250900,250913,250936,250963,250966,250986,251013,251076,251109,251115-251116,251133,251142,251146,251159,251172,251175-251176,251187,251213,251249,251251-251254,251281,251297,251351,251358,251368,251373,251382,251394,251396,251402-251403,251434,251481-251482,251499,251515-251516,251518,251600,251605,251638,251661,251713,251715,251729,251733,251769,251872,251945,251959-251961,252143,252166,252180,252185,252203,252206,252227,252262,252271-252273,252278,252295,252312,252402,252404,252469,252471,252498,252501,252576,252580,252661,252702-252709,252711,252715-252716,252724,252728,252747,252851-252852,252857,252864,252867,252869,252912,253036,253069,253074,253094,253102,253107-253108,253112-253113,253120,253134,253209,253217,253284-253285,253303,253330,253392,253398,253404,253406-253408,253437-253439,253450,253460,253471,253473-253476,253480-253481,253483,253497,253532,253540,253549-253550,253620,253644,253647,253654,253688,253699,253701,253709-253710,253757,253809,253812-253813,253829,253865,253873,253889-253890,253899-253900,253902,253920,253965,253980,254002,254004-254005,254008,254121,254191,254238,254243,254253,254257,254262-254264,254302-254303,254330,254372,254379,254389,254430,254438,254571-254572,254577,254615,254727,254742,254792,254794,254796-254798,254813,254817-254822,254828,254833,254835-254838,254840-254841,254848,254852-254853,254858,254860-254868,254870-254871,254873-254880,254882-254883,254885,254894,254933,254976,254987,255003,255009,255012-255013,255037,255039,255041-255042,255044-255045,255050-255052,255077,255090,255109-255112,255123,255128,255131,255166-255167,255198,255238,255320,255356,255410-255411,255439,255472,255488,255501,255571-255573,255587,255648,255718,255736,255768,255869,255921,255932,255972-255973,256038,256066,256118-256119,256125,256131,256151-256155,256169,256231,256299,256341,256459,256477,256500,256548,256718,256720-256722,256750,256771,256782,256827-256828,256848,256868,256955,257007,257071,257132,257206,257276,257304-257307,257390,257409-257411,257429,257435,257490,257515,257534,257594,257654,257712,257732,257743,257748,257772,257808,257847,257869-257870,257883,257913,257955,257957-257958,258036,258082-258083,258140,258155-258156,258162,258168,258170,258187,258262,258331,258363,258441,258545,258549,258553,258622,258641,258643,258689,258732-258733,258830,258840,258879,258919,258921,258930,258941,258961,259003,259016,259023,259029-259032,259046,259049,259095,259101,259103-259104,259110,259129-259130,259178-259179,259203,259221,259248,259261,259382,259393,259462,259527,259532,259543-259547,259612,259615,259650-259651,259667,259675,259679-259680,259684,259717,259727,259776-259777,259812,259838,259882,259915,259928,259939,260044-260045,260050,260053,260058,260061,260063-260064,260086,260110,260113,260160,260184,260210,260219,260243,260382,260388,260415,260429,260449-260450,260534-260536,260542,260559,260563,260566,260582-260583,260588-260589,260688,260808,260814,260830,260903,260926,260953,261003-261005,261033,261068,261118,261123-261124,261134,261147,261149-261151,261164,261166-261168,261216,261228,261243,261260,261262,261269,261291,261315,261330,261343,261394-261395,261491,261497,261505,261507,261520,261524,261526-261528,261531,261533,261535-261537,261541,261543-261544,261552-261553,261558,261585,261795,261827,261861,261872,261981,262128-262129,262417,262439,262454-262455,262465,262477-262478,262550-262551,262553-262554,262572,262575,262663,262732,262795,262972,262999,263080,263155,263159,263169,263275-263278,263289,263310-263311,263317,263412,263423,263457,263710,263885,263957,263985,264010,264031,264062,264084,264127,264149,264244,264257-264259,264293-264294,264327,264340,264354,264416,264514,264610,264621,264653,264800-264802,264831-264832,264849,264878,264883,264923,264934,265015,265102,265149,265236,265262,265386,265411,265424,265473,265484-265485,265703,265709,265712,265779,265943,266011,266195,266270,266281,266490,266541,266738,266744,266792-266793,266799,266808,266908,266969,267078-267079,267082,267109,267179,267240,267321,267342,267368,267451,267600,267647,267689,267712,267757,267839,267883,267955,268078,268080,268095,268209,268303,268354,268460,268582-268584,268640,268706,268726,268735,268796,268854,268929,268971,268989,269127,269228,269470,269488,269565-269566,269569,269575-269576,269578,269780,269783,270134,270384,270750,270830,270992,271017-271018,271073,271156,271163,271196,271218,271286,271403,271492,271728,271864,271874,271946,271953,271975,272190,272254,272349,272422,272479-272480,272721,272729-272730,272732,272756,272897,273018,273034,273135,273181,273216,273236,273252,273280,273328,273359,273376-273378,273423,273455,273615,273773,273973,274227,274325,274351,274402,274724,274918,274988,275101,275110,275605-275606,275624,275646,275790,275808,275816,275870-275871,276065,276239-276240,276282,276299,276313,276321,276344,276351,276404,276407,276717,276724,276798-276799,276892,276959,277043-277044,277048,277050,277136,277179,277246,277417,277579,277806,277907,277974,278071,278105,278292,278321,278364,278379,278477,278503,278532,278850,279223,279233,279270,279544,279563,279642,279725,279854,279892,279903,279919,279941,279963,279969,280090,280322,280347,280429,280598,281006,281159,281309,281337,281537,281698,281745,281887,281941,282017,282505,282577,282652,283064,283121,283123,283261,283269,283274,283679,284011-284012,284022,284125,284335,284383,284447,284470,284477,284552,284600-284601,284722,284724,284739,284741,285340,285909,285912-285914,285973,286720,286733,286799,286886-286887,287151-287153,287155,287238,287321,287355,287575,287592,287616,287673,287698,287747,287768,287772,287825,288180,288452,289028-289030,289199,289560,289635,289719,290170,290326,290374,290414-290416,290441,290489,290566,290639,290855,290946,291146,292638-292639,294854,294900,294933,294949,294952-294953,294957,294965,294967-294968,295017,295026-295027,295649,295823,295830,295923,295928,296071,296148,296286,296342,296470,296472-296473,296575,296579,297155,297696,297873,297884,298294,298424,298496,298519,298591,298950,299060,299977,300089,300667,301039,301206,302076,302175,302371,303076,303225,303765,303806,304521 Reverse-merged /user/mav/ata/sys/dev:r189793-190578 Reverse-merged /user/thompsa/usb/sys/dev:r187190 Reverse-merged /user/jimharris/isci/sys/dev:r228377-230794 Reverse-merged /projects/largeSMP/sys/dev:r221273-222812,222815-223757