Index: stable/8/sys/amd64/include/xen =================================================================== --- stable/8/sys/amd64/include/xen (revision 211702) +++ stable/8/sys/amd64/include/xen (revision 211703) Property changes on: stable/8/sys/amd64/include/xen ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/amd64/include/xen:r210779 Index: stable/8/sys/cam =================================================================== --- stable/8/sys/cam (revision 211702) +++ stable/8/sys/cam (revision 211703) Property changes on: stable/8/sys/cam ___________________________________________________________________ Deleted: svn:mergeinfo ## -0,10 +0,0 ## Reverse-merged /user/mav/ata/sys/cam:r189793-190578 Reverse-merged /user/thompsa/usb/sys/cam:r187190 Reverse-merged /user/piso/ipfw/sys/cam:r190918,190921,190923,190926 Reverse-merged /user/dfr/xenhvm/6/sys/cam:r189304,189451 Reverse-merged /user/dfr/xenhvm/7/sys/cam:r188574-189614 Reverse-merged /projects/cambria/sys/cam:r186008-186350 Reverse-merged /user/peter/kinfo/sys/cam:r185413-185547 Reverse-merged /user/piso/sys/cam:r186543,186723,186725-186726,186742,186770-186771,186774,186777-186779,187984-187985,190555,190572,190589,190592,190614,190625,190830 Reverse-merged /head/sys/cam:r196118,196121-196122,196129,196132,196135,196141-196142,196149-196150,196152,196159,196162,196174,196176,196179,196193,196196,196200-196201,196203-196206,196224,196226,196228-196230,196234,196246,196256,196260,196263,196267-196269,196274,196276,196289,196291,196293,196295,196297,196299,196301,196303,196307,196309,196316,196318,196326,196332-196334,196342,196352-196353,196358,196364,196366,196368,196370,196372,196376,196378,196380,196386,196388,196390,196395,196397,196403-196404,196410,196412,196415,196417,196419,196423,196435,196455-196458,196460,196464-196466,196470-196471,196481-196482,196487-196498,196501-196505,196507,196509-196510,196512,196516-196520,196524,196529,196531-196536,196543,196547,196551,196553,196556,196559-196560,196567-196569,196579-196580,196592,196608-196610,196615,196633,196635,196637,196640,196643-196644,196648-196649,196653,196655-196657,196659-196660,196662,196678,196689,196692,196702-196705,196707,196714,196717,196721,196730,196733,196738-196739,196745,196762,196772,196777,196785,196796-196798,196809,196822-196824,196826,196835,196837,196840,196844,196863-196865,196871,196879,196887-196889,196891,196893,196897-196898,196900-196901,196903-196904,196907,196919-196921,196927,196932,196941,196943-196944,196947,196949,196953-196954,196964-196966,196978-196980,196982-196983,196985,196987,196993,197009,197011,197017-197019,197021-197022,197025,197030-197031,197039-197040,197043,197046,197048-197049,197062,197070,197073-197074,197077-197080,197082,197084-197085,197099,197104-197105,197107,197109,197128-197133,197150-197156,197164,197167,197172-197174,197176-197177,197185,197190,197193,197195,197201-197203,197208,197210,197212,197214,197218-197219,197223-197225,197227,197235,197240-197243,197257,197260-197263,197269,197286-197289,197293-197294,197306,197316-197317,197323,197325-197328,197331,197334,197341-197342,197348,197350-197351,197364,197372-197373,197379-197381,197383-197384,197386-197391,197395,197397,197399,197401-197403,197405-197407,197410,197413,197415-197416,197420-197421,197424,197426,197428,197433,197435,197438-197439,197442,197444,197449-197450,197458-197469,197475-197476,197478,197490,197493,197496-197497,197501,197504,197512-197515,197518,197525,197535,197540-197541,197553-197556,197558-197559,197561-197573,197579-197581,197583-197592,197600,197603-197606,197608,197611,197624,197627,197636,197640-197641,197643-197645,197647-197650,197654,197657-197663,197680,197682-197683,197687-197688,197692,197695-197696,197709,197711,197720-197721,197726-197727,197729-197730,197735,197761,197772,197783,197789,197791,197795,197803,197814,197816,197824,197831-197832,197837-197838,197841-197843,197856,197860-197861,197868,197896,197898,197910,197914,197928-197930,197932-197934,197942,197945,197948,197950-197952,197955,197961-197963,197975-197977,197997,197999,198020,198043,198049-198050,198075-198076,198079,198097-198099,198111,198126,198134,198149,198151-198153,198170,198174,198185,198194,198196,198198,198201-198203,198212-198213,198218-198219,198223,198230,198233,198237,198242,198250-198252,198257-198260,198262,198271,198277,198279,198289-198291,198295,198301,198303,198306-198307,198318-198322,198327-198328,198331-198333,198338,198341-198343,198346,198353,198356,198366-198367,198369,198372-198373,198377-198378,198381-198382,198384-198385,198389-198391,198393-198394,198400,198407,198411,198417-198421,198423,198426-198429,198431-198432,198438-198439,198444-198445,198452,198464,198467-198468,198472,198475-198476,198479-198483,198486-198488,198499,198502,198505-198508,198519-198520,198522,198525,198537,198539,198541,198546,198554,198581-198583,198587,198590,198593,198617,198621,198623,198670,198678,198684,198691-198692,198694-198697,198700,198703,198705,198708,198717-198719,198723-198725,198731,198733,198748,198752,198774-198776,198782,198813-198814,198818,198822,198832,198845,198849,198851-198853,198857-198858,198862,198865-198868,198896-198897,198899,198904-198905,198911,198923-198924,198927-198928,198940,198945,198947,198950,198952,198964,198967-198968,198976,198988,198990,198993,198996-198997,199002,199007-199012,199014-199017,199020,199035-199036,199043,199050,199053-199054,199057-199062,199065,199067,199069,199073-199074,199084,199086,199108,199115-199116,199132,199135-199137,199151,199153,199156-199157,199169,199173,199176,199178,199184,199186-199187,199192-199193,199208-199210,199215,199219,199223,199225-199230,199232,199237-199241,199253,199258-199260,199262-199263,199268-199269,199273-199274,199278-199281,199284,199287,199321-199322,199332-199333,199337-199338,199355,199365,199369-199374,199413,199418,199437,199442,199459,199477,199491,199502,199518,199522-199523,199525-199529,199533-199535,199543,199548-199553,199556,199558,199561,199563-199566,199574,199576,199579-199580,199602,199608-199613,199616-199617,199645-199646,199661-199668,199670-199680,199714-199715,199717-199718,199727,199747,199749,199761,199763-199764,199798-199799,199807-199808,199814,199816,199821-199822,199827,199829,199846,199852,199866,199875,199883-199888,199893-199897,199899,199904-199906,199941,199946-199949,199968-199969,199974,199997,200001,200003,200008,200014,200018,200026-200027,200033,200037,200045,200051-200053,200055,200058,200060,200064,200082-200084,200086-200089,200091,200102,200107,200109-200111,200117,200121,200124-200126,200129,200158,200162,200171,200180,200182,200196,200200,200207,200215-200219,200223,200227-200228,200230,200239-200241,200243,200246,200251,200253-200255,200264,200268,200272-200273,200275,200287,200291,200295,200304-200310,200353,200357,200359,200375,200395-200397,200414,200422,200444,200447,200459,200471,200473,200481-200482,200485,200514,200519-200536,200538-200541,200543-200545,200548,200551-200555,200557-200558,200572,200584,200591,200594,200602,200607,200609,200613,200615-200617,200631,200635,200637-200639,200644,200652-200653,200655,200657-200658,200666-200668,200671,200693,200696,200723-200724,200726-200727,200739-200740,200753-200754,200756,200758-200759,200764,200770,200776,200796,200798,200801,200803-200804,200808,200810,200814-200817,200820-200827,200829,200845,200847,200853-200854,200856-200857,200865,200871-200880,200884-200889,200891,200899,200904-200908,200910-200918,200920-200926,200930,200933-200935,200938,200940,200942,200944-200948,200950,200955,200965-200966,200969,200972,200976-200977,200987,200991,200993-200995,200999-201000,201003-201005,201008-201009,201021,201023,201028-201029,201031-201032,201044,201052,201071,201126,201131,201134,201139,201143,201145,201151,201196,201199-201200,201209,201222,201254,201261,201264,201269,201282,201284-201285,201318-201319,201325,201339-201340,201342,201345,201347,201349-201352,201371,201373-201374,201395-201396,201406,201408,201410,201415-201416,201438-201439,201442-201443,201446,201523,201532,201543-201545,201566-201567,201645,201680-201681,201684,201688-201690,201701,201703,201709-201710,201714,201742,201756,201758,201766-201769,201790,201797,201801,201813-201814,201818,201822,201848,201853,201879,201882,201890,201895-201896,201898-201899,201901,201907,201924,201932,201941,201953-201955,201966,201978,201990,201993,201995,202000,202003,202006,202010-202011,202019,202023,202054,202056-202057,202085,202097,202116,202119-202121,202123,202127,202129,202143,202150,202156,202161,202163,202166,202170,202181,202243,202267-202273,202286,202290,202293-202294,202341-202342,202364,202376,202387,202406,202418,202441,202448-202449,202468-202469,202516-202518,202520-202521,202523,202526,202528-202529,202534,202552,202558,202567,202587-202588,202608-202609,202611-202612,202671,202678,202692,202699,202717,202736,202767,202771,202773-202774,202782-202783,202789,202796,202812,202821-202822,202826-202827,202863,202870,202881-202882,202889,202894,202898,202900,202903-202904,202915,202917,202919,202931,202934-202935,202940,202964,202967,202971,202986,203030,203033-203034,203043,203049-203052,203054,203058,203061-203062,203070,203072,203078,203081-203083,203085,203087,203090,203094,203106,203108,203119,203123,203134,203137-203146,203148,203156,203158-203160,203165,203175,203177,203179,203185,203272,203289,203303,203319-203320,203334-203335,203341,203347,203350,203352,203354-203355,203358,203360,203367,203376,203384-203386,203401,203408,203410,203414,203421,203426,203430,203444-203445,203449,203451,203453,203455,203463,203478,203483-203484,203489,203499,203503-203504,203506-203507,203524-203525,203528-203530,203533,203535,203546,203572,203622,203637,203673,203678-203680,203682-203683,203685,203691,203693,203695-203696,203708,203716,203724,203727-203729,203731-203732,203750-203751,203763,203776,203783,203785,203788,203801,203810,203813,203818,203822,203826-203831,203833-203834,203838-203839,203843-203844,203846-203849,203866,203870,203873,203875,203882-203885,203896,203899,203903,203905-203906,203924,203930-203931,203933-203936,203944-203945,203959,203968,204009,204019,204040,204042,204050-204051,204067,204071,204073,204076,204081-204082,204096,204101-204102,204105-204106,204128-204129,204140-204147,204149,204151-204153,204155-204156,204158,204164,204173,204179-204180,204182-204185,204195,204197,204205,204210,204212,204216,204218-204220,204222-204223,204225,204228,204230,204235-204236,204242,204248-204250,204253,204256-204257,204264-204265,204268-204271,204274,204278-204279,204281,204283,204296-204297,204315-204317,204326-204328,204348,204351,204353-204354,204356,204361-204363,204365-204368,204370-204374,204376-204378,204384-204385,204397,204402,204408,204410,204412-204413,204415,204420,204425,204430,204436-204437,204462-204476,204498,204509,204518,204521,204533,204539-204542,204545,204576,204578-204579,204581,204589-204590,204611,204633,204638,204641,204644,204647-204648,204656-204657,204662,204670,204675,204692,204694,204719,204753,204764,204773,204804-204807,204809-204810,204826,204830,204838,204874,204877-204878,204901-204905,204907,204913,204916,204920-204923,204941,204957,204965,204972,204975,204978-204979,204981,204983,204989-204990,204992,205003,205005,205010,205013-205015,205024,205026-205036,205038-205040,205042-205043,205066,205069,205074-205075,205077,205079-205080,205082-205083,205092-205093,205095-205097,205102,205104,205120,205126,205132-205134,205140-205141,205160-205161,205163,205167,205172,205197,205210,205214,205222-205223,205231,205234,205236,205251-205255,205258,205263-205264,205268-205269,205276,205279,205297,205299-205300,205316-205327,205332,205334,205345-205347,205356-205358,205370,205385,205399,205402,205409,205411-205413,205422,205428-205429,205431-205435,205448,205452,205454-205455,205488,205495,205497,205502,205516,205527,205534-205536,205550,205557-205558,205562,205564,205566,205569,205572-205573,205604-205605,205626-205629,205637,205647,205649-205653,205661,205663,205665,205678,205680-205681,205694,205698,205712-205713,205720,205723,205726-205727,205734,205778,205789,205791,205801-205805,205838,205847,205851,205858,205860,205865,205869,205884,205886,205904,205919,205932,205941,205944-205950,205959,205967,205986-205987,205993,205998,206000-206001,206015,206017-206021,206023,206026-206029,206032,206049-206051,206053-206054,206061,206063,206086,206089,206093-206094,206097-206098,206109,206117,206128-206130,206137,206151,206160,206170,206174,206206,206210,206236,206264,206268,206281,206358,206364,206367,206370-206372,206384,206388,206395,206398,206403,206409,206415-206421,206426,206429-206431,206433,206436-206437,206443-206450,206452,206454,206456,206459-206460,206469-206470,206474-206477,206480-206482,206486,206488,206544-206547,206551,206553,206563,206595,206604,206614,206617,206623,206625,206629,206637-206638,206648,206650-206652,206659,206662,206665,206667,206671-206672,206684,206688,206690,206705,206758,206761,206763-206768,206770,206792-206797,206801,206814,206818,206838,206840,206844,206859,206876,206878-206880,206891-206892,206894,206897,206916,206989,206992,207001,207007-207008,207016,207020,207027,207068,207071,207077-207080,207082,207094,207099,207116,207152,207170,207176,207178,207181,207191,207194-207195,207197,207207,207221-207223,207240-207243,207248,207251,207268-207269,207275-207278,207281-207282,207285-207287,207303,207306,207329-207331,207334-207335,207337,207349-207350,207359-207360,207362-207366,207369,207375-207377,207379-207380,207391,207404,207409,207411,207427-207428,207430-207433,207442,207445-207446,207463,207468,207475,207480-207481,207484,207490,207499-207500,207511,207532-207533,207536-207537,207543,207545,207569-207570,207572,207579-207580,207585,207600,207602-207603,207605-207606,207620,207622-207626,207628,207630,207635,207638-207639,207643,207651-207652,207659,207670-207671,207673,207676,207680,207683,207687-207688,207696,207709,207729,207748,207750,207761,207763-207764,207785,207832,207847-207848,207851-207852,207877-207878,207885,207908-207911,207920-207922,207924-207926,207929,207933-207934,207936-207938,207956-207958,207963,207966,207970,207983,207985,208006-208019,208026,208030,208036,208047-208048,208050,208052,208081-208084,208097,208100-208103,208117,208119-208120,208129-208131,208142-208143,208147-208150,208152,208159-208160,208162,208166-208168,208172-208173,208183,208212,208234,208254,208276,208279,208282,208285,208293,208300,208309,208312,208340,208348-208350,208356,208362,208364,208370-208375,208379,208388,208390-208393,208405,208410-208414,208442-208443,208454-208455,208458,208468,208472,208474,208488,208507-208509,208512,208553-208556,208564-208565,208567,208587,208601,208603-208605,208610,208621,208633,208642-208644,208650,208669-208672,208689,208696,208699,208703,208711-208712,208717,208731,208742,208746,208761-208762,208770,208773,208775-208777,208787,208796,208800,208806,208808-208809,208813-208814,208816-208820,208822-208823,208835-208837,208849,208852-208857,208861-208864,208870,208874-208876,208878-208879,208883,208891,208895,208897,208901-208902,208905,208907,208912,208915,208917-208918,208920,208925,208946-208947,208951-208953,208969-208970,208982-208983,208989,208991,208994,209013,209016,209022,209026,209029,209056,209060,209062,209068,209070-209071,209085,209093-209101,209104-209106,209114,209119-209120,209138,209155,209169,209178,209186-209189,209191,209193-209194,209196-209197,209204,209212-209213,209218,209222,209237-209238,209241-209242,209244,209247,209259-209261,209268,209275,209325,209328-209330,209340-209341,209361,209367,209369,209425,209444-209445,209447,209466,209470,209483,209490,209492,209499,209512,209523,209540-209541,209548,209577,209592,209595,209597-209599,209611,209616,209664,209685,209687,209695,209714,209718,209737,209740-209744,209761,209793,209812,209818,209836,209853,209859-209860,209865,209872,209883-209884,209892,209934,209944,209946,209948-209950,209955-209957,209959-209961,209963,209965-209966,209977-209978,209981,209987,210003,210005,210011-210015,210030,210032,210034,210046,210066,210083,210102,210107-210111,210113-210114,210117,210129,210135-210137,210149,210152,210154-210155,210157,210165,210168,210178,210184,210201,210227,210244,210248,210257,210259-210261,210263,210267-210271,210282,210294,210350,210358,210369,210383,210401,210422-210423,210427-210428,210443,210446,210452,210454-210455,210457,210505,210515-210516,210524,210532,210534,210543,210556,210569,210571,210576-210577,210604,210621,210623,210631,210661,210686,210703,210746-210747,210779,210783,210786,210792,210795-210796,210805,210839,210847-210848,210931,210947,210968,211005-211006,211022,211063,211089,211091,211115,211301,211315-211317,211327,211333,211339 Reverse-merged /user/luigi/ipfw3-r8/sys/cam:r204833-205453 Index: stable/8/sys/cddl/contrib/opensolaris =================================================================== --- stable/8/sys/cddl/contrib/opensolaris (revision 211702) +++ stable/8/sys/cddl/contrib/opensolaris (revision 211703) Property changes on: stable/8/sys/cddl/contrib/opensolaris ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/cddl/contrib/opensolaris:r210779 Index: stable/8/sys/contrib/dev/acpica =================================================================== --- stable/8/sys/contrib/dev/acpica (revision 211702) +++ stable/8/sys/contrib/dev/acpica (revision 211703) Property changes on: stable/8/sys/contrib/dev/acpica ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/dev/acpica:r210779 Index: stable/8/sys/contrib/pf =================================================================== --- stable/8/sys/contrib/pf (revision 211702) +++ stable/8/sys/contrib/pf (revision 211703) Property changes on: stable/8/sys/contrib/pf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/pf:r210779 Index: stable/8/sys/dev/xen/xenpci =================================================================== --- stable/8/sys/dev/xen/xenpci (revision 211702) +++ stable/8/sys/dev/xen/xenpci (revision 211703) Property changes on: stable/8/sys/dev/xen/xenpci ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/dev/xen/xenpci:r210779 Index: stable/8/sys =================================================================== --- stable/8/sys (revision 211702) +++ stable/8/sys (revision 211703) Property changes on: stable/8/sys ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys:r210779