Switched to branch "2.6.25-rc6-mc11"
Switched to branch "ide"
Switched to branch "2.6.25-rc6-mc11"
Already on branch "2.6.25-rc6-mc11"
remote: Counting objects: 525, done.
remote: Compressing objects:   1% (1/57)   
remote: Compressing objects:   3% (2/57)   
remote: Compressing objects:   5% (remote: 3/57)   
remote: Compressing objects:   7% (4/57)   
remote: Compressing objects:   8% (5/57)   
remote: Compressing objects:  10% (6/57)   
remote: Compressingremote:  objects:  12% (7/57)   
remote: Compressing objects:  14% (8/57)   
remote: Compressing objects:  15% (9/57)   
remote: Compressing objects:  17% (10/5remote: 7)   
remote: Compressing objects:  19% (11/57)   
remote: Compressing objects:  21% (12/57)   
remote: Compressing objects:  22% (13/57)   
remote: Compressingremote:  objects:  24% (14/57)   
remote: Compressing objects:  26% (15/57)   
remote: Compressing objects:  28% (16/57)   
remote: Compressing objects:  29% (17/57)   
remote: Compressing objecremote: ts:  31% (18/57)   
remote: Compressing objects:  33% (19/57)   
remote: Compressing objects:  35% (20/57)   
remote: Compressing objects:  36% (21/57) remote:   
remote: Compressing objects:  38% (22/57)   
remote: Compressing objects:  40% (23/57)   
remote: Compressing objects:  42% (24/57)   
remote: Compressing obremote: jects:  43% (25/57)   
remote: Compressing objects:  45% (26/57)   
remote: Compressing objects:  47% (27/57)   
remote: Compressing objects:  49% (28/5remote: 7)   
remote: Compressing objects:  50% (29/57)   
remote: Compressing objects:  52% (30/57)   
remote: Compressing objects:  54% (31/57)   
remote: Compressingremote:  objects:  56% (32/57)   
remote: Compressing objects:  57% (33/57)   
remote: Compressing objects:  59% (34/57)   
remote: Compressing objects:  61% (3remote: 5/57)   
remote: Compressing objects:  63% (36/57)   
remote: Compressing objects:  64% (37/57)   
remote: Compressing objects:  66% (38/57)   
remote: Compressremote: ing objects:  68% (39/57)   
remote: Compressing objects:  70% (40/57)   
remote: Compressing objects:  71% (41/57)   
remote: Compressing objects:  73%Receiving objects:   0% (1/356)   
Receiving objects:   1% (4/356)   
Receiving objects:   2% (8/356)   
Receiving objects:   3% (11/356)   
Receiving objects:   4% (15/356)   
Receiving objects:   5% (18/356)   
Receiving objects:   6% (22/356)   
Receiving objects:   7% (25/356)   
Receiving objects:   8% (29/356)   
Receiving objects:   9% (33/356)   
Receiving objects:  10% (36/356)   
Receiving objects:  11% (40/356)   
Receiving objects:  12% (43/356)   
Receiving objects:  13% (47/356)   
Receiving objects:  14% (50/356)   
Receiving objects:  15% (54/356)   
Receiving objects:  16% (57/356)   
Receiving objects:  17% (61/356)   
Receiving objects:  18% (65/356)   
Receiving objects:  19% (68/356)   
Receiving objects:  20% (72/356)   
Receiving objects:  21% (75/356)   
Receiving objects:  22% (79/356)   
Receiving objects:  23% (82/356)   
Receiving objects:  24% (86/356)   
Receiving objects:  25% (89/356)   
Receiving objects:  26% (93/356)   
Receiving objects:  27% (97/356)   
Receiving objects:  28% (100/356)   
Receiving objects:  29% (104/356)   
Receiving objects:  30% (107/356)   
Receiving objects:  31% (111/356)   
Receiving objects:  32% (114/356)   
Receiving objects:  33% (118/356)   
Receiving objects:  34% (122/356)   
Receiving objects:  35% (125/356)   
Receiving objects:  36% (129/356)   
Receiving objects:  37% (132/356)   
Receiving objects:  38% (136/356)   
Receiving objects:  39% (139/356)   
Receiving objects:  40% (143/356)   
Receiving objects:  41% (146/356)   
Receiving objects:  42% (150/356)   
Receiving objects:  43% (154/356)   
Receiving objects:  44% (157/356)   
Receiving objects:  45% (161/356)   
Receiving objects:  46% (164/356)   
Receiving objects:  47% (168/356)   
Receiving objects:  48% (171/356)   
Receiving objects:  49% (175/356)   
Receiving objects:  50% (178/356)   
Receiving objects:  51% (182/356)   
Receiving objects:  52% (186/356)   
Receiving objects:  53% (189/356)   
Receiving objects:  54% (193/356)   
Receiving objects:  55% (196/356)   
Receiving objects:  56% (200/356)   
Receiving objects:  57% (203/356)   
Receiving objects:  58% (207/356)   
Receiving objects:  59% (211/356)   
remote:  (42/57)   
remote: Compressing objects:  75% (43/57)   
remote: Compressing objects:  77% (44/57)   
remote: Compressing objects:  78% (45/57)   
remote: Comprremote: essing objects:  80% (46/57)   
remote: Compressing objects:  82% (47/57)   
remote: Compressing objects:  84% (48/57)   
remote: Compressing objects:  remote: 85% (49/57)   
remote: Compressing objects:  87% (50/57)   
remote: Compressing objects:  89% (51/57)   
remote: Compressing objects:  91% (52/57)   
remote: Coremote: mpressing objects:  92% (53/57)   
remote: Compressing objects:  94% (54/57)   
remote: Compressing objects:  96% (55/57)   
remote: Compressing objectsremote: :  98% (56/57)   
remote: Compressing objects: 100% (57/57)   
remote: Compressing objects: 100% (57/57), done.
remote: Total 356 (delta 299), reused 35remote: 6 (delta 299)
Receiving objects:  60% (214/356)   
Receiving objects:  61% (218/356)   
Receiving objects:  62% (221/356)   
Receiving objects:  63% (225/356)   
Receiving objects:  64% (228/356)   
Receiving objects:  65% (232/356)   
Receiving objects:  66% (235/356)   
Receiving objects:  67% (239/356)   
Receiving objects:  68% (243/356)   
Receiving objects:  69% (246/356)   
Receiving objects:  70% (250/356)   
Receiving objects:  71% (253/356)   
Receiving objects:  72% (257/356)   
Receiving objects:  73% (260/356)   
Receiving objects:  74% (264/356)   
Receiving objects:  75% (267/356)   
Receiving objects:  76% (271/356)   
Receiving objects:  77% (275/356)   
Receiving objects:  78% (278/356)   
Receiving objects:  79% (282/356)   
Receiving objects:  80% (285/356)   
Receiving objects:  81% (289/356)   
Receiving objects:  82% (292/356)   
Receiving objects:  83% (296/356)   
Receiving objects:  84% (300/356)   
Receiving objects:  85% (303/356)   
Receiving objects:  86% (307/356)   
Receiving objects:  87% (310/356)   
Receiving objects:  88% (314/356)   
Receiving objects:  89% (317/356)   
Receiving objects:  90% (321/356)   
Receiving objects:  91% (324/356)   
Receiving objects:  92% (328/356)   
Receiving objects:  93% (332/356)   
Receiving objects:  94% (335/356)   
Receiving objects:  95% (339/356)   
Receiving objects:  96% (342/356)   
Receiving objects:  97% (346/356)   
Receiving objects:  98% (349/356)   
Receiving objects:  99% (353/356)   
Receiving objects: 100% (356/356)   
Receiving objects: 100% (356/356), 77.88 KiB, done.
Resolving deltas:   0% (1/299)   
Resolving deltas:   1% (4/299)   
Resolving deltas:   2% (6/299)   
Resolving deltas:   3% (9/299)   
Resolving deltas:  15% (46/299)   
Resolving deltas:  16% (48/299)   
Resolving deltas:  17% (51/299)   
Resolving deltas:  18% (54/299)   
Resolving deltas:  19% (57/299)   
Resolving deltas:  20% (60/299)   
Resolving deltas:  28% (86/299)   
Resolving deltas:  29% (87/299)   
Resolving deltas:  34% (103/299)   
Resolving deltas:  35% (105/299)   
Resolving deltas:  36% (109/299)   
Resolving deltas:  38% (114/299)   
Resolving deltas:  39% (117/299)   
Resolving deltas:  40% (120/299)   
Resolving deltas:  41% (124/299)   
Resolving deltas:  42% (126/299)   
Resolving deltas:  43% (129/299)   
Resolving deltas:  44% (132/299)   
Resolving deltas:  45% (135/299)   
Resolving deltas:  46% (138/299)   
Resolving deltas:  47% (141/299)   
Resolving deltas:  48% (144/299)   
Resolving deltas:  49% (147/299)   
Resolving deltas:  50% (150/299)   
Resolving deltas:  51% (153/299)   
Resolving deltas:  52% (157/299)   
Resolving deltas:  53% (159/299)   
Resolving deltas:  54% (162/299)   
Resolving deltas:  55% (165/299)   
Resolving deltas:  56% (168/299)   
Resolving deltas:  57% (171/299)   
Resolving deltas:  58% (174/299)   
Resolving deltas:  59% (177/299)   
Resolving deltas:  60% (180/299)   
Resolving deltas:  61% (183/299)   
Resolving deltas:  62% (186/299)   
Resolving deltas:  63% (189/299)   
Resolving deltas:  64% (192/299)   
Resolving deltas:  65% (195/299)   
Resolving deltas:  66% (198/299)   
Resolving deltas:  67% (201/299)   
Resolving deltas:  68% (204/299)   
Resolving deltas:  69% (207/299)   
Resolving deltas:  70% (210/299)   
Resolving deltas:  71% (214/299)   
Resolving deltas:  72% (217/299)   
Resolving deltas:  73% (221/299)   
Resolving deltas:  74% (222/299)   
Resolving deltas:  75% (226/299)   
Resolving deltas:  76% (230/299)   
Resolving deltas:  77% (231/299)   
Resolving deltas:  81% (245/299)   
Resolving deltas:  85% (257/299)   
Resolving deltas:  86% (258/299)   
Resolving deltas:  87% (263/299)   
Resolving deltas:  88% (264/299)   
Resolving deltas:  89% (267/299)   
Resolving deltas:  90% (272/299)   
Resolving deltas:  91% (273/299)   
Resolving deltas:  92% (276/299)   
Resolving deltas:  93% (279/299)   
Resolving deltas:  94% (282/299)   
Resolving deltas:  95% (285/299)   
Resolving deltas:  96% (289/299)   
Resolving deltas:  97% (291/299)   
Resolving deltas:  98% (295/299)   
Resolving deltas:  99% (297/299)   
Resolving deltas: 100% (299/299)   
Resolving deltas: 100% (299/299), completed with 159 local objects.
From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6
 + 676600a...f7c8fc9 gregkh-driver -> scsi-driverbase  (forced update)
From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6
   00c04db..028011e  gregkh-driver-base -> scsi-driverbase-base
Switched to branch "gregkh-driver"
Switched to branch "2.6.25-rc6-mc11"
Switched to branch "gregkh-driver"
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Switched to branch "2.6.25-rc6-mc11"
Switched to branch "gregkh-pci"
.dotest/patch:167: space before tab in indent.
 	dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
warning: 1 line adds whitespace errors.
Switched to branch "2.6.25-rc6-mc11"
Already on branch "2.6.25-rc6-mc11"
Automatic merge failed; fix conflicts and then commit the result.
Switched to branch "gregkh-usb"
.dotest/patch:32: space before tab in indent.
 		for (j = 0; j < N_IN_URB; j++) {
.dotest/patch:33: space before tab in indent.
 			portdata->in_buffer[j] = kmalloc(IN_BUFLEN, GFP_KERNEL);
.dotest/patch:34: space before tab in indent.
 			if (!portdata->in_buffer[j]) {
.dotest/patch:35: space before tab in indent.
 				for ( --j; j >= 0; j--)
.dotest/patch:36: space before tab in indent.
 					kfree(portdata->in_buffer[j]);
warning: squelched 4 whitespace errors
warning: 9 lines add whitespace errors.
.dotest/patch:225: space before tab in indent.
 	 */
warning: 1 line adds whitespace errors.
.dotest/patch:2601: space before tab in indent.
 		dbg(1," %s : file is NULL", __func__);
.dotest/patch:2609: space before tab in indent.
 		dbg(1," %s : object is NULL", __func__);
.dotest/patch:8366: space before tab in indent.
  	dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length);
.dotest/patch:8741: space before tab in indent.
		  	dbg ("%s - Update complete 0x%x", __func__, status);
.dotest/patch:8805: space before tab in indent.
	  		dbg ("%s - Error downloading operational code image", __func__);
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
Switched to branch "2.6.25-rc6-mc11"
Already on branch "2.6.25-rc6-mc11"
remote: Counting objects: 1828, done.
remote: Compressing objects:   0% (1/414)   
remote: Compressing objects:   1% (5/414)   
remote: Compressing objects:   2% (9/414)   
remote: Compressing objects:   3% (13/414)   
remote: Compressing objects:   4% (17/414)   
remote: Compressing objects:   5% (21/414)   
remote: Compressing objects:   6% (25/414)   
remote: Compressing objects:   7% (29/414)   
remote: Compressing obremote: jects:   8% (34/414)   
remote: Compressing objects:   9% (38/414)   
remote: Compressing objects:  10% (42/414)   
remote: Compressing objects:  11% (46/414)   
remote: Compressing objects:  12% (50/414)   
remote: Compressing objects:  13% (54/414)   
remote: Compressing objects:  14% (58/414)   
remote: Compressing objects:  15% (63/414)   
remote: Compressing objects:  16% (67/414)   
remote: Compressing objects:  17% (71/414)   
remote: Compressing objects:  18% (75/414)   
remote: Compressing objects:  19% (79/414)   
remote: Compressing objects:  20% (83/414)   
remote: Compressing objects:  21% (87/414)   
remote: Compressing objects:  22% (92/414)   
remote: Compressing objects:  23% (96/414)   
remote: Compressing objects:  24% (100/414)   
remote: Compressing objects:  25% (104/414)   
remote: Compressing objects:  26% (108/414)   
remote: Compressing objects:  27% (112/414)   
remote: Compressing objects:  28% (116/414)   
remote: Compressing objects:  29% (121/414)   
remote: Compressing objects:  30% (125/414)   
remote: Compressing objects:  31% (129/414)   
remote: Compressing objects:  32% (133/414)   
remote: Compressing objects:  33% (137/414)   
remote: Compressing objects:  34% (141/414)   
remote: Compressing objects:  35% (145/414)   
remote: Compressing objects:  36% (150/414)   
remote: Compressing objects:  37% (154/414)   
remote: Compressing objects:  38% (158/414)   
remote: Compressing objects:  39% (162/414)   
remote: Compressing objects:  40% (166/414)   
remote: Compressing objects:  41% (170/414)   
remote: Compressing objects:  42% (174/414)   
remote: Compressing objects:  43% (179/414)   
remote: Compressing objects:  44% (183/414)   
remote: Compressing objects:  45% (187/414)   
remote: Compressing objects:  46% (191/414)   
remote: Compressing objects:  47% (195/414)   
remote: Compressing objects:  48% (199/414)   
remote: Compressing objects:  49% (203/414)   
remote: Compressing objects:  50% (207/414)   
remote: Compressing objects:  51% (212/414)   
remote: Compressing objects:  52% (216/414)   
remote: Compressing objects:  53% (220/414)   
remote: Compressing objects:  54% (224/414)   
remote: Compressing objects:  55% (228/414)   
remote: Compressing objects:  56% (232/414)   
remote: Compressing objects:  57% (236/414)   
remote: Compressing objects:  58% (241/414)   
remote: Compressing objects:  59% (245/414)   
remote: Compressing objects:  60% (249/414)   
remote: Compressing objects:  61% (253/414)   
remote: Compressing objects:  62% (257/414)   
remote: Compressing objects:  63% (261/414)   
remote: Compressing objects:  64% (265/414)   
remote: Compressing objects:  65% (270/414)   
remote: Compressing objects:  66% (274/414)   
remote: Compressing objects:  67% (278/414)   
remote: Compressing objects:  68% (282/414)   
remote: Compressing objects:  69% (286/414)   
remote: Compressing objects:  70% (290/414)   
remote: Compressing objects:  71% (294/414)   
remote: Compressing objects:  72% (299/414)   
remote: Compressing objects:  73% (303/414)   
remote: Compressing objects:  74% (307/414)   
remote: Compressing objects:  75% (311/414)   
remote: Compressing objects:  76% (315/414)   
remote: Compressing objects:  77% (319/414)   
remote: Compressing objects:  78% (323/414)   
remote: Compressing objects:  79% (328/414)   
remote: Compressing objects:  80% (332/414)   
remote: Compressing objects:  81% (336/414)   
remote: Compressing objects:  82% (340/414)   
remote: Compressing objects:  83% (344/414)   
remote: Compressing objects:  84% (348/414)   
remote: Compressing objects:  85% (352/414)   
remote: Compressing objects:  86% (357/414)   
remote: Compressing objects:  87% (361/414)   
remote: Compressing objects:  88% (365/414)   
remote: Compressing objects:  89% (369/414)   
remote: Compressing objects:  90% (373/414)   
remote: Compressing objects:  91% (377/414)   
remote: Compressing objects:  92% (381/414)   
remote: Compressing objects:  93% (386/414)   
remote: Compressing objects:  94% (390/414)   
remote: Compressing objects:  95% (394/414)   
remote: Compressing objects:  96% (398/414)   
remote: Compressing objects:  97% (402/414)   
remote: Compressing objects:  98% (406/414)   
remote: Compressing objects:  99% (410/414)   
remote: Compressing objects: 100% (414/414)   
remote: Compressing objects: 100% (414/414), done.
Receiving objects:   0% (1/1583)   
Receiving objects:   1% (16/1583)   
Receiving objects:   2% (32/1583)   
Receiving objects:   3% (48/1583)   
Receiving objects:   4% (64/1583)   
Receiving objects:   5% (80/1583)   
Receiving objects:   6% (95/1583)   
Receiving objects:   7% (111/1583)   
Receiving objects:   8% (127/1583)   
Receiving objects:   9% (143/1583)   
Receiving objects:  10% (159/1583)   
Receiving objects:  11% (175/1583)   
Receiving objects:  12% (190/1583)   
Receiving objects:  13% (206/1583)   
Receiving objects:  14% (222/1583)   
Receiving objects:  15% (238/1583)   
Receiving objects:  16% (254/1583)   
Receiving objects:  17% (270/1583)   
Receiving objects:  18% (285/1583)   
Receiving objects:  19% (301/1583)   
Receiving objects:  20% (317/1583)   
Receiving objects:  21% (333/1583)   
Receiving objects:  22% (349/1583)   
Receiving objects:  23% (365/1583)   
Receiving objects:  24% (380/1583)   
Receiving objects:  25% (396/1583)   
Receiving objects:  26% (412/1583)   
Receiving objects:  27% (428/1583)   
Receiving objects:  28% (444/1583)   
Receiving objects:  29% (460/1583)   
Receiving objects:  30% (475/1583)   
Receiving objects:  31% (491/1583)   
Receiving objects:  32% (507/1583)   
Receiving objects:  33% (523/1583)   
Receiving objects:  34% (539/1583)   
Receiving objects:  35% (555/1583)   
Receiving objects:  36% (570/1583)   
Receiving objects:  37% (586/1583)   
Receiving objects:  38% (602/1583)   
Receiving objects:  39% (618/1583)   
Receiving objects:  40% (634/1583)   
Receiving objects:  41% (650/1583)   
Receiving objects:  42% (665/1583)   
Receiving objects:  43% (681/1583)   
Receiving objects:  44% (697/1583)   
Receiving objects:  45% (713/1583)   
Receiving objects:  46% (729/1583)   
Receiving objects:  47% (745/1583)   
Receiving objects:  48% (760/1583)   
Receiving objects:  49% (776/1583)   
Receiving objects:  50% (792/1583)   
Receiving objects:  51% (808/1583)   
Receiving objects:  52% (824/1583)   
Receiving objects:  53% (839/1583)   
Receiving objects:  54% (855/1583)   
Receiving objects:  55% (871/1583)   
Receiving objects:  56% (887/1583)   
Receiving objects:  57% (903/1583)   
Receiving objects:  58% (919/1583)   
Receiving objects:  59% (934/1583)   
Receiving objects:  60% (950/1583)   
Receiving objects:  61% (966/1583)   
Receiving objects:  62% (982/1583)   
Receiving objects:  63% (998/1583)   
Receiving objects:  64% (1014/1583)   
Receiving objects:  65% (1029/1583)   
Receiving objects:  66% (1045/1583)   
Receiving objects:  67% (1061/1583)   
Receiving objects:  68% (1077/1583)   
Receiving objects:  69% (1093/1583)   
Receiving objects:  70% (1109/1583)   
Receiving objects:  71% (1124/1583)   
Receiving objects:  72% (1140/1583)   
Receiving objects:  73% (1156/1583)   
Receiving objects:  74% (1172/1583)   
Receiving objects:  75% (1188/1583)   
Receiving objects:  76% (1204/1583)   
Receiving objects:  77% (1219/1583)   
Receiving objects:  78% (1235/1583)   
Receiving objects:  79% (1251/1583)   
Receiving objects:  80% (1267/1583)   
Receiving objects:  81% (1283/1583)   
Receiving objects:  82% (1299/1583)   
Receiving objects:  83% (1314/1583)   
Receiving objects:  84% (1330/1583)   
Receiving objects:  85% (1346/1583)   
Receiving objects:  86% (1362/1583)   
Receiving objects:  87% (1378/1583)   
Receiving objects:  88% (1394/1583)   
Receiving objects:  89% (1409/1583)   
Receiving objects:  90% (1425/1583)   
Receiving objects:  91% (1441/1583)   
Receiving objects:  92% (1457/1583)   
Receiving objects:  93% (1473/1583)   
Receiving objects:  94% (1489/1583)   
Receiving objects:  95% (1504/1583)   
Receiving objects:  96% (1520/1583)   
Receiving objects:  97% (1536/1583)   
Receiving objects:  98% (1552/1583)   
Receiving objects:  99% (1568/1583)   
Receiving objects: 100% (1583/1583)   
Receiving objects: 100% (1583/1583), 275.48 KiB, done.
Resolving deltas:   0% (8/1394)   
Resolving deltas:   2% (33/1394)   
Resolving deltas:   3% (55/1394)   
Resolving deltas:   4% (56/1394)   
Resolving deltas:   5% (83/1394)   
Resolving deltas:   6% (87/1394)   
Resolving deltas:   8% (113/1394)   
Resolving deltas:  16% (233/1394)   
Resolving deltas:  19% (267/1394)   
Resolving deltas:  32% (448/1394)   
Resolving deltas:  33% (461/1394)   
Resolving deltas:  34% (474/1394)   
Resolving deltas:  35% (489/1394)   
remote: Total 1583 (delta 1394), reused 1358 (delta 1169)
Resolving deltas:  48% (671/1394)   
Resolving deltas:  49% (684/1394)   
Resolving deltas:  50% (697/1394)   
Resolving deltas:  51% (711/1394)   
Resolving deltas:  52% (732/1394)   
Resolving deltas:  53% (740/1394)   
Resolving deltas:  54% (753/1394)   
Resolving deltas:  66% (921/1394)   
Resolving deltas:  67% (934/1394)   
Resolving deltas:  68% (949/1394)   
Resolving deltas:  69% (962/1394)   
Resolving deltas:  70% (989/1394)   
Resolving deltas:  71% (990/1394)   
Resolving deltas:  73% (1020/1394)   
Resolving deltas:  74% (1034/1394)   
Resolving deltas:  75% (1046/1394)   
Resolving deltas:  76% (1066/1394)   
Resolving deltas:  77% (1074/1394)   
Resolving deltas:  78% (1088/1394)   
Resolving deltas:  80% (1120/1394)   
Resolving deltas:  81% (1134/1394)   
Resolving deltas:  82% (1147/1394)   
Resolving deltas:  83% (1163/1394)   
Resolving deltas:  84% (1171/1394)   
Resolving deltas:  85% (1185/1394)   
Resolving deltas:  86% (1203/1394)   
Resolving deltas:  87% (1217/1394)   
Resolving deltas:  88% (1229/1394)   
Resolving deltas:  89% (1241/1394)   
Resolving deltas:  90% (1260/1394)   
Resolving deltas:  91% (1277/1394)   
Resolving deltas:  92% (1290/1394)   
Resolving deltas:  93% (1297/1394)   
Resolving deltas:  94% (1314/1394)   
Resolving deltas:  95% (1325/1394)   
Resolving deltas:  97% (1354/1394)   
Resolving deltas:  98% (1367/1394)   
Resolving deltas:  99% (1382/1394)   
Resolving deltas: 100% (1394/1394)   
Resolving deltas: 100% (1394/1394), completed with 224 local objects.
From /pub/scm/linux/kernel/git/mchehab/v4l-dvb
 + 49fc9cc...fb6950d devel      -> dvb  (forced update)
Switched to branch "i2c"
Switched to branch "2.6.25-rc6-mc11"
Already on branch "2.6.25-rc6-mc11"
error: branch 'libata-upstream' not found.
remote: Counting objects: 13, done.
remote: Compressing objects:  14% (1/7)   
remote: Compressing objects:  28% (2/7)   
remote: Compressing objects:  42% (3/7)   
remote: Compressing objects:  5remote: 7% (4/7)   
remote: Compressing objects:  71% (5/7)   
remote: Compressing objects:  85% (6/7)   
remote: Compressing objects: 100% (7/7)   
remote: Compressingremote:  objects: 100% (7/7), done.
remote: Total 7 (delta 6), reused 0 (delta 0)
From /pub/scm/linux/kernel/git/roland/infiniband
   dba92d3..f2b2b59  for-linus  -> infiniband-for-linus
remote: Counting objects: 597, done.
remote: Compressing objects:   0% (1/313)   
remote: Compressing objects:   1% (4/313)   
remote: Compressing objects:   2% (7/313)   
remote: Compressing objects:   3% (10/313)   
remote: Compressing objects:   4% (13/313)   
remote: Compressing objects:   5% (16/313)   
remote: Compressing objects:   6% (19/313)   
remote: Compressing objects:   7% (22/313)   
remote: Compressing objects:   8% (26/313)   
remote: Compressing objects:   9% (29/313)   
remote: Compressing objects:  10% (32/313)   
remote: Compressing objects:  11% (35/313)   
remote: Compressing objects:  12% (38/313)   
remote: Compressing objects:  13% (41/313)   
remote: Compressing objects:  14% (44/313)   
remote: Compressing objects:  15% (47/313)   
remote: Compressing objects:  16% (51/313)   
remote: Compressing objects:  17% (54/313)   
remote: Compressing objects:  18% (57/313)   
remote: Compressing objects:  19% (60/313)   
remote: Compressing objects:  20% (63/313)   
remote: Compressing objects:  21% (66/313)   
remote: Compressing objects:  22% (69/313)   
remote: Compressing objects:  23% (72/313)   
remote: Compressing objects:  24% (76/313)   
remote: Compressing objects:  25% (79/313)   
remote: Compressing objects:  26% (82/313)   
remote: Compressing objects:  27% (85/313)   
remote: Compressing objects:  28% (88/313)   
remote: Compressing objects:  29% (91/313)   
remote: Compressing objects:  30% (94/313)   
remote: Compressing objects:  31% (98/313)   
remote: Compressing objects:  32% (101/313)   
remote: Compressing objects:  33% (104/313)   
remote: Compressing objects:  34% (107/313)   
remote: Compressing objects:  35% (110/313)   
remote: Compressing objects:  36% (113/313)   
remote: Compressing objects:  37% (116/313)   
remote: Compressing objects:  38% (119/313)   
remote: Compressing objects:  39% (123/313)   
remote: Compressing objects:  40% (126/313)   
remote: Compressing objects:  41% (129/313)   
remote: Compressing objects:  42% (132/313)   
remote: Compressing objects:  43% (135/313)   
remote: Compressing objects:  44% (138/313)   
remote: Compressing objects:  45% (141/313)   
remote: Compressing objects:  46% (144/313)   
remote: Compressing objects:  47% (148/313)   
remote: Compressing objects:  48% (151/313)   
remote: Compressing objects:  49% (154/313)   
remote: Compressing objects:  50% (157/313)   
remote: Compressing objects:  51% (160/313)   
remote: Compressing objects:  52% (163/313)   
remote: Compressing objects:  53% (166/313)   
remote: Compressing objects:  54% (170/313)   
remote: Compressing objects:  55% (173/313)   
remote: Compressing objects:  56% (176/313)   
remote: Compressing objects:  57% (179/313)   
remote: Compressing objects:  58% (182/313)   
remote: Compressing objects:  59% (185/313)   
remote: Compressing objects:  60% (188/313)   
remote: Compressing objects:  61% (191/313)   
remote: Compressing objects:  62% (195/313)   
remote: Compressing objects:  63% (198/313)   
remote: Compressing objects:  64% (201/313)   
remote: Compressing objects:  65% (204/313)   
remote: Compressing objects:  66% (207/313)   
remote: Compressing objects:  67% (210/313)   
remote: Compressing objects:  68% (213/313)   
remote: Compressing objects:  69% (216/313)   
remote: Compressing objects:  70% (220/313)   
remote: Compressing objects:  71% (223/313)   
remote: Compressing objects:  72% (226/313)   
remote: Compressing objects:  73% (229/313)   
remote: Compressing objects:  74% (232/313)   
remote: Compressing objects:  75% (235/313)   
remote: Compressing objects:  76% (238/313)   
remote: Compressing objects:  77% (242/313)   
remote: Compressing objects:  78% (245/313)   
remote: Compressing objects:  79% (248/313)   
remote: Compressing objects:  80% (251/313)   
remote: Compressing objects:  81% (254/313)   
remote: Compressing objects:  82% (257/313)   
remote: Compressing objects:  83% (260/313)   
remote: Compressing objects:  84% (263/313)   
remote: Compressing objects:  85% (267/313)   
remote: Compressing objects:  86% (270/313)   
remote: Compressing objects:  87% (273/313)   
remote: Compressing objects:  88% (276/313)   
remote: Compressing objects:  89% (279/313)   
remote: Compressing objects:  90% (282/313)   
remote: Compressing objects:  91% (285/313)   
remote: Compressing objects:  92% (288/313)   
remote: Compressing objects:  93% (292/313)   
remote: Compressing objects:  94% (295/313)   
remote: Compressing objects:  95% (298/313)   
remote: Compressing objects:  96% (301/313)   
remote: Compressing objects:  97% (304/313)   
remote: Compressing objects:  98% (307/313)   
remote: Compressing objects:  99% (310/313)   
remote: Compressing objects: 100% (313/313)   
remote: Compressing objects: 100% (313/313), done.
Receiving objects:   0% (1/479)   
Receiving objects:   1% (5/479)   
Receiving objects:   2% (10/479)   
Receiving objects:   3% (15/479)   
Receiving objects:   4% (20/479)   
Receiving objects:   5% (24/479)   
Receiving objects:   6% (29/479)   
Receiving objects:   7% (34/479)   
Receiving objects:   8% (39/479)   
Receiving objects:   9% (44/479)   
Receiving objects:  10% (48/479)   
Receiving objects:  11% (53/479)   
Receiving objects:  12% (58/479)   
Receiving objects:  13% (63/479)   
Receiving objects:  14% (68/479)   
Receiving objects:  15% (72/479)   
Receiving objects:  16% (77/479)   
Receiving objects:  17% (82/479)   
Receiving objects:  18% (87/479)   
Receiving objects:  19% (92/479)   
Receiving objects:  20% (96/479)   
Receiving objects:  21% (101/479)   
Receiving objects:  22% (106/479)   
Receiving objects:  23% (111/479)   
Receiving objects:  24% (115/479)   
Receiving objects:  25% (120/479)   
Receiving objects:  26% (125/479)   
Receiving objects:  27% (130/479)   
Receiving objects:  28% (135/479)   
Receiving objects:  29% (139/479)   
Receiving objects:  30% (144/479)   
Receiving objects:  31% (149/479)   
Receiving objects:  32% (154/479)   
Receiving objects:  33% (159/479)   
Receiving objects:  34% (163/479)   
Receiving objects:  35% (168/479)   
Receiving objects:  36% (173/479)   
Receiving objects:  37% (178/479)   
Receiving objects:  38% (183/479)   
Receiving objects:  39% (187/479)   
Receiving objects:  40% (192/479)   
Receiving objects:  41% (197/479)   
Receiving objects:  42% (202/479)   
Receiving objects:  43% (206/479)   
Receiving objects:  44% (211/479)   
Receiving objects:  45% (216/479)   
Receiving objects:  46% (221/479)   
Receiving objects:  47% (226/479)   
Receiving objects:  48% (230/479)   
Receiving objects:  49% (235/479)   
Receiving objects:  50% (240/479)   
Receiving objects:  51% (245/479)   
Receiving objects:  52% (250/479)   
Receiving objects:  53% (254/479)   
Receiving objects:  54% (259/479)   
Receiving objects:  55% (264/479)   
Receiving objects:  56% (269/479)   
Receiving objects:  57% (274/479)   
Receiving objects:  58% (278/479)   
Receiving objects:  59% (283/479)   
Receiving objects:  60% (288/479)   
Receiving objects:  61% (293/479)   
Receiving objects:  62% (297/479)   
Receiving objects:  63% (302/479)   
Receiving objects:  64% (307/479)   
Receiving objects:  65% (312/479)   
Receiving objects:  66% (317/479)   
Receiving objects:  67% (321/479)   
Receiving objects:  68% (326/479)   
Receiving objects:  69% (331/479)   
Receiving objects:  70% (336/479)   
Receiving objects:  71% (341/479)   
Receiving objects:  72% (345/479)   
Receiving objects:  73% (350/479)   
Receiving objects:  74% (355/479)   
Receiving objects:  75% (360/479)   
Receiving objects:  76% (365/479)   
Receiving objects:  77% (369/479)   
Receiving objects:  78% (374/479)   
Receiving objects:  79% (379/479)   
Receiving objects:  80% (384/479)   
Receiving objects:  81% (388/479)   
Receiving objects:  82% (393/479)   
Receiving objects:  83% (398/479)   
Receiving objects:  84% (403/479)   
Receiving objects:  85% (408/479)   
Receiving objects:  86% (412/479)   
Receiving objects:  87% (417/479)   
Receiving objects:  88% (422/479)   
Receiving objects:  89% (427/479)   
Receiving objects:  90% (432/479)   
Receiving objects:  91% (436/479)   
Receiving objects:  92% (441/479)   
Receiving objects:  93% (446/479)   
Receiving objects:  94% (451/479)   
Receiving objects:  95% (456/479)   
Receiving objects:  96% (460/479)   
Receiving objects:  97% (465/479)   
Receiving objects:  98% (470/479)   
Receiving objects:  99% (475/479)   
Receiving objects: 100% (479/479)   
Receiving objects: 100% (479/479), 71.59 KiB, done.
Resolving deltas:   0% (1/419)   
Resolving deltas:   4% (18/419)   
Resolving deltas:   8% (34/419)   
Resolving deltas:   9% (39/419)   
Resolving deltas:  15% (65/419)   
Resolving deltas:  17% (72/419)   
Resolving deltas:  21% (88/419)   
Resolving deltas:  22% (94/419)   
Resolving deltas:  34% (146/419)   
Resolving deltas:  47% (197/419)   
Resolving deltas:  48% (204/419)   
Resolving deltas:  49% (206/419)   
remote: Total 479 (delta 419), reused 195 (delta 166)
Resolving deltas:  50% (210/419)   
Resolving deltas:  52% (218/419)   
Resolving deltas:  53% (224/419)   
Resolving deltas:  54% (227/419)   
Resolving deltas:  55% (234/419)   
Resolving deltas:  56% (235/419)   
Resolving deltas:  57% (239/419)   
Resolving deltas:  58% (244/419)   
Resolving deltas:  59% (248/419)   
Resolving deltas:  60% (253/419)   
Resolving deltas:  61% (256/419)   
Resolving deltas:  62% (260/419)   
Resolving deltas:  63% (264/419)   
Resolving deltas:  67% (282/419)   
Resolving deltas:  68% (288/419)   
Resolving deltas:  69% (290/419)   
Resolving deltas:  71% (299/419)   
Resolving deltas:  72% (302/419)   
Resolving deltas:  73% (307/419)   
Resolving deltas:  74% (313/419)   
Resolving deltas:  75% (315/419)   
Resolving deltas:  76% (320/419)   
Resolving deltas:  77% (324/419)   
Resolving deltas:  78% (328/419)   
Resolving deltas:  79% (333/419)   
Resolving deltas:  80% (339/419)   
Resolving deltas:  81% (341/419)   
Resolving deltas:  82% (345/419)   
Resolving deltas:  83% (348/419)   
Resolving deltas:  84% (352/419)   
Resolving deltas:  85% (358/419)   
Resolving deltas:  86% (362/419)   
Resolving deltas:  87% (366/419)   
Resolving deltas:  88% (371/419)   
Resolving deltas:  89% (374/419)   
Resolving deltas:  90% (379/419)   
Resolving deltas:  91% (382/419)   
Resolving deltas:  92% (386/419)   
Resolving deltas:  93% (392/419)   
Resolving deltas:  94% (394/419)   
Resolving deltas:  95% (402/419)   
Resolving deltas:  96% (404/419)   
Resolving deltas:  97% (407/419)   
Resolving deltas:  98% (411/419)   
Resolving deltas: 100% (419/419)   
Resolving deltas: 100% (419/419), completed with 113 local objects.
From /pub/scm/linux/kernel/git/roland/infiniband
 + 262407e...0f9d8de for-2.6.26 -> infiniband  (forced update)
Switched to branch "infiniband"
Finished one revert.
Switched to branch "2.6.25-rc6-mc11"
Already on branch "2.6.25-rc6-mc11"
Automatic merge failed; fix conflicts and then commit the result.
remote: Counting objects: 573   
remote: Counting objects: 4218, done.
remote: Compressing objects:   0% (1/1052)   
remote: Compressing objects:   1% (11/1052)   
remote: Compressing objects:   2% (22/1052)   
remote: Compressing objects:   3% (32/1052)   
remote: Compressing objects:   4% (43/1052)   
remote: Compressing objects:   5% (53/1052)   
remote: Compressing objects:   6% (64/1052)   
remote: Compressing objects:   7% (74/1052)   
remote: Compressing objects:   8% (85/1052)   
remote: Compressing objects:   9% (95/1052)   
remote: Compressing objects:  10% (106/1052)   
remote: Compressing objects:  11% (116/1052)   
remote: Compressing objects:  12% (127/1052)   
remote: Compressing objects:  13% (137/1052)   
remote: Compressing objects:  14% (148/1052)   
remote: Compressing objects:  15% (158/1052)   
remote: Compressing objects:  16% (169/1052)   
remote: Compressing objects:  17% (179/1052)   
remote: Compressing objects:  18% (190/1052)   
remote: Compressing objects:  19% (200/1052)   
remote: Compressing objects:  20% (211/1052)   
remote: Compressing objects:  21% (221/1052)   
remote: Compressing objects:  22% (232/1052)   
remote: Compressing objects:  23% (242/1052)   
remote: Compressing objects:  24% (253/1052)   
remote: Compressing objects:  25% (263/1052)   
remote: Compressing objects:  26% (274/1052)   
remote: Compressing objects:  27% (285/1052)   
remote: Compressing objects:  28% (295/1052)   
remote: Compressing objects:  29% (306/1052)   
remote: Compressing objects:  30% (316/1052)   
remote: Compressing objects:  31% (327/1052)   
remote: Compressing objects:  32% (337/1052)   
remote: Compressing objects:  33% (348/1052)   
remote: Compressing objects:  34% (358/1052)   
remote: Compressing objects:  35% (369/1052)   
remote: Compressing objects:  36% (379/1052)   
remote: Compressing objects:  37% (390/1052)   
remote: Compressing objects:  38% (400/1052)   
remote: Compressing objects:  39% (411/1052)   
remote: Compressing objects:  40% (421/1052)   
remote: Compressing objects:  41% (432/1052)   
remote: Compressing objects:  42% (442/1052)   
remote: Compressing objects:  43% (453/1052)   
remote: Compressing objects:  44% (463/1052)   
remote: Compressing objects:  45% (474/1052)   
remote: Compressing objects:  46% (484/1052)   
remote: Compressing objects:  47% (495/1052)   
remote: Compressing objects:  48% (505/1052)   
remote: Compressing objects:  49% (516/1052)   
remote: Compressing objects:  50% (526/1052)   
remote: Compressing objects:  51% (537/1052)   
remote: Compressing objects:  52% (548/1052)   
remote: Compressing objects:  53% (558/1052)   
remote: Compressing objects:  54% (569/1052)   
remote: Compressing objects:  55% (579/1052)   
remote: Compressing objects:  56% (590/1052)   
remote: Compressing objects:  57% (600/1052)   
remote: Compressing objects:  58% (611/1052)   
remote: Compressing objects:  59% (621/1052)   
remote: Compressing objects:  60% (632/1052)   
remote: Compressing objects:  61% (642/1052)   
remote: Compressing objects:  62% (653/1052)   
remote: Compressing objects:  63% (663/1052)   
remote: Compressing objects:  64% (674/1052)   
remote: Compressing objects:  65% (684/1052)   
remote: Compressing objects:  66% (695/1052)   
remote: Compressing objects:  67% (705/1052)   
remote: Compressing objects:  68% (716/1052)   
remote: Compressing objects:  69% (726/1052)   
remote: Compressing objects:  70% (737/1052)   
remote: Compressing objects:  71% (747/1052)   
remote: Compressing objects:  72% (758/1052)   
remote: Compressing objects:  73% (768/1052)   
remote: Compressing objects:  74% (779/1052)   
remote: Compressing objects:  75% (789/1052)   
remote: Compressing objects:  76% (800/1052)   
remote: Compressing objects:  77% (811/1052)   
remote: Compressing objects:  78% (821/1052)   
remote: Compressing objects:  79% (832/1052)   
remote: Compressing objects:  80% (842/1052)   
remote: Compressing objects:  81% (853/1052)   
remote: Compressing objects:  82% (863/1052)   
remote: Compressing objects:  83% (874/1052)   
remote: Compressing objects:  84% (884/1052)   
remote: Compressing objects:  85% (895/1052)   
remote: Compressing objects:  86% (905/1052)   
remote: Compressing objects:  87% (916/1052)   
remote: Compressing objects:  88% (926/1052)   
remote: Compressing objects:  89% (937/1052)   
remote: Compressing objects:  90% (947/1052)   
remote: Compressing objects:  91% (958/1052)   
remote: Compressing objects:  92% (968/1052)   
remote: Compressing objects:  93% (979/1052)   
remote: Compressing objects:  94% (989/1052)   
remote: Compressing objects:  95% (1000/1052)   
remote: Compressing objects:  96% (1010/1052)   
remote: Compressing objects:  97% (1021/1052)   
remote: Compressing objects:  98% (1031/1052)   
remote: Compressing objects:  99% (1042/1052)   
remote: Compressing objects: 100% (1052/1052)   
remote: Compressing objects: 100% (1052/1052), done.
Receiving objects:   0% (1/3672)   
Receiving objects:   1% (37/3672)   
Receiving objects:   2% (74/3672)   
Receiving objects:   3% (111/3672)   
Receiving objects:   4% (147/3672)   
Receiving objects:   5% (184/3672)   
Receiving objects:   6% (221/3672)   
Receiving objects:   7% (258/3672)   
Receiving objects:   8% (294/3672)   
Receiving objects:   9% (331/3672)   
Receiving objects:  10% (368/3672)   
Receiving objects:  11% (404/3672)   
Receiving objects:  12% (441/3672)   
Receiving objects:  13% (478/3672)   
Receiving objects:  14% (515/3672)   
Receiving objects:  15% (551/3672)   
Receiving objects:  16% (588/3672)   
Receiving objects:  17% (625/3672)   
Receiving objects:  18% (661/3672)   
Receiving objects:  19% (698/3672)   
Receiving objects:  20% (735/3672)   
Receiving objects:  21% (772/3672)   
Receiving objects:  22% (808/3672)   
Receiving objects:  23% (845/3672)   
Receiving objects:  24% (882/3672)   
Receiving objects:  25% (918/3672)   
Receiving objects:  26% (955/3672)   
Receiving objects:  27% (992/3672)   
Receiving objects:  28% (1029/3672)   
Receiving objects:  29% (1065/3672)   
Receiving objects:  30% (1102/3672)   
Receiving objects:  31% (1139/3672)   
Receiving objects:  32% (1176/3672)   
Receiving objects:  33% (1212/3672)   
Receiving objects:  34% (1249/3672)   
Receiving objects:  35% (1286/3672)   
Receiving objects:  36% (1322/3672)   
Receiving objects:  37% (1359/3672)   
Receiving objects:  38% (1396/3672)   
Receiving objects:  39% (1433/3672)   
Receiving objects:  40% (1469/3672)   
Receiving objects:  41% (1506/3672)   
Receiving objects:  42% (1543/3672)   
Receiving objects:  43% (1579/3672)   
Receiving objects:  44% (1616/3672)   
Receiving objects:  45% (1653/3672)   
Receiving objects:  46% (1690/3672)   
Receiving objects:  47% (1726/3672)   
Receiving objects:  48% (1763/3672)   
Receiving objects:  49% (1800/3672)   
Receiving objects:  50% (1836/3672)   
Receiving objects:  51% (1873/3672)   
Receiving objects:  52% (1910/3672)   
Receiving objects:  53% (1947/3672)   
Receiving objects:  54% (1983/3672)   
Receiving objects:  55% (2020/3672)   
Receiving objects:  56% (2057/3672)   
Receiving objects:  57% (2094/3672)   
Receiving objects:  58% (2130/3672)   
Receiving objects:  59% (2167/3672)   
Receiving objects:  60% (2204/3672)   
Receiving objects:  61% (2240/3672)   
Receiving objects:  62% (2277/3672)   
Receiving objects:  63% (2314/3672)   
Receiving objects:  64% (2351/3672)   
Receiving objects:  65% (2387/3672)   
Receiving objects:  66% (2424/3672)   
Receiving objects:  67% (2461/3672)   
Receiving objects:  68% (2497/3672)   
Receiving objects:  69% (2534/3672)   
Receiving objects:  70% (2571/3672)   
Receiving objects:  71% (2608/3672)   
Receiving objects:  72% (2644/3672)   
Receiving objects:  73% (2681/3672)   
Receiving objects:  74% (2718/3672)   
Receiving objects:  75% (2754/3672)   
Receiving objects:  76% (2791/3672)   
Receiving objects:  77% (2828/3672)   
Receiving objects:  78% (2865/3672)   
Receiving objects:  79% (2901/3672)   
Receiving objects:  80% (2938/3672)   
Receiving objects:  81% (2975/3672)   
Receiving objects:  82% (3012/3672)   
Receiving objects:  83% (3048/3672)   
Receiving objects:  84% (3085/3672)   
Receiving objects:  85% (3122/3672)   
Receiving objects:  86% (3158/3672)   
Receiving objects:  87% (3195/3672)   
Receiving objects:  88% (3232/3672)   
Receiving objects:  89% (3269/3672)   
Receiving objects:  90% (3305/3672)   
Receiving objects:  91% (3342/3672)   
Receiving objects:  92% (3379/3672)   
Receiving objects:  93% (3415/3672)   
Receiving objects:  94% (3452/3672)   
Receiving objects:  95% (3489/3672)   
Receiving objects:  96% (3526/3672)   
Receiving objects:  97% (3562/3672)   
Receiving objects:  98% (3599/3672)   
Receiving objects:  99% (3636/3672)   
Receiving objects: 100% (3672/3672)   
Receiving objects: 100% (3672/3672), 1.08 MiB, done.
Resolving deltas:   0% (4/3197)   
Resolving deltas:   1% (34/3197)   
Resolving deltas:   2% (66/3197)   
Resolving deltas:   3% (106/3197)   
Resolving deltas:   4% (128/3197)   
Resolving deltas:   5% (161/3197)   
Resolving deltas:   7% (253/3197)   
Resolving deltas:   8% (259/3197)   
remote: Total 3672 (delta 3197), reused 3042 (delta 2620)
Resolving deltas:   9% (288/3197)   
Resolving deltas:  15% (501/3197)   
Resolving deltas:  16% (524/3197)   
Resolving deltas:  17% (564/3197)   
Resolving deltas:  18% (588/3197)   
Resolving deltas:  24% (781/3197)   
Resolving deltas:  26% (845/3197)   
Resolving deltas:  27% (868/3197)   
Resolving deltas:  32% (1045/3197)   
Resolving deltas:  33% (1061/3197)   
Resolving deltas:  34% (1091/3197)   
Resolving deltas:  35% (1119/3197)   
Resolving deltas:  36% (1152/3197)   
Resolving deltas:  37% (1204/3197)   
Resolving deltas:  38% (1235/3197)   
Resolving deltas:  40% (1283/3197)   
Resolving deltas:  41% (1312/3197)   
Resolving deltas:  42% (1349/3197)   
Resolving deltas:  43% (1381/3197)   
Resolving deltas:  44% (1415/3197)   
Resolving deltas:  45% (1440/3197)   
Resolving deltas:  46% (1471/3197)   
Resolving deltas:  47% (1503/3197)   
Resolving deltas:  48% (1535/3197)   
Resolving deltas:  50% (1628/3197)   
Resolving deltas:  51% (1631/3197)   
Resolving deltas:  52% (1673/3197)   
Resolving deltas:  53% (1699/3197)   
Resolving deltas:  58% (1858/3197)   
Resolving deltas:  59% (1890/3197)   
Resolving deltas:  61% (1951/3197)   
Resolving deltas:  62% (1983/3197)   
Resolving deltas:  63% (2017/3197)   
Resolving deltas:  64% (2053/3197)   
Resolving deltas:  65% (2083/3197)   
Resolving deltas:  66% (2113/3197)   
Resolving deltas:  67% (2156/3197)   
Resolving deltas:  68% (2174/3197)   
Resolving deltas:  69% (2206/3197)   
Resolving deltas:  70% (2244/3197)   
Resolving deltas:  71% (2281/3197)   
Resolving deltas:  72% (2326/3197)   
Resolving deltas:  73% (2335/3197)   
Resolving deltas:  74% (2373/3197)   
Resolving deltas:  75% (2407/3197)   
Resolving deltas:  76% (2430/3197)   
Resolving deltas:  77% (2462/3197)   
Resolving deltas:  78% (2495/3197)   
Resolving deltas:  84% (2710/3197)   
Resolving deltas:  90% (2894/3197)   
Resolving deltas:  92% (2967/3197)   
Resolving deltas:  93% (2988/3197)   
Resolving deltas:  95% (3058/3197)   
Resolving deltas:  96% (3072/3197)   
Resolving deltas:  97% (3116/3197)   
Resolving deltas:  98% (3144/3197)   
Resolving deltas:  99% (3182/3197)   
Resolving deltas: 100% (3197/3197)   
Resolving deltas: 100% (3197/3197), completed with 426 local objects.
From /pub/scm/linux/kernel/git/davem/net-2.6.26
   6f8b13b..ec3c098  master     -> net
Already on branch "2.6.25-rc6-mc11"
Automatic merge failed; fix conflicts and then commit the result.
remote: Generating pack...
remote: Done counting 474 objects.
remote: Result has 392 objects.
remote: Deltifying 392 objects...
remote:    0% (1/392) done
remote:    1% (4/392) done
remote:    2% (8/392) done
remote:    3% (12/392) done
remote:    4% (16/392) done
remote:    5% (20/392) done
remote:    6% (24/392) done
remote:    7% (28/392) done
remote:    8% (32/392) done
remote:    9% (36/392) done
remote:   10% (40/392) done
remote:   11% (44/392) done
remote:   12% (48/392) done
remote:   13% (51/392) done
remote:   14% (55/392) done
remote:   15% (59/392) done
remote:   16% (63/392) done
remote:   17% (67/392) done
remote:   18% (71/392) done
remote:   19% (75/392) done
remote:   20% (79/392) done
remote:   21% (83/392) done
remote:   22% (87/392) done
remote:   23% (91/392) done
remote:   24% (95/392) done
remote:   25% (98/392) done
remote:   26% (102/392) done
remote:   27% (106/392) done
remote:   28% (110/392) done
remote:   29% (114/392) done
remote:   30% (118/392) done
remote:   31% (122/392) done
remote:   32% (126/392) done
remote:   33% (130/392) done
remote:   34% (134/392) done
remote:   35% (138/392) done
remote:   36% (142/392) done
remote:   37% (146/392) done
remote:   38% (149/392) done
remote:   39% (153/392) done
remote:   40% (157/392) done
remote:   41% (161/392) done
remote:   42% (165/392) done
remote:   43% (169/392) done
remote:   44% (173/392) done
remote:   45% (177/392) done
remote:   46% (181/392) done
remote:   47% (185/392) done
remote:   48% (189/392) done
remote:   49% (193/392) done
remote:   50% (196/392) done
remote:   51% (200/392) done
remote:   52% (204/392) done
remote:   53% (208/392) done
remote:   54% (212/392) done
remote:   55% (216/392) done
remote:   56% (220/392) done
remote:   57% (224/392) done
remote:   58% (228/392) done
remote:   59% (232/392) done
remote:   60% (236/392) done
remote:   61% (240/392) done
remote:   62% (244/392) done
remote:   63% (247/392) done
remote:   64% (251/392) done
remote:   65% (255/392) done
remote:   66% (259/392) done
remote:   67% (263/392) done
remote:   68% (267/392) done
remote:   69% (271/392) done
remote:   70% (275/392) done
remote:   71% (279/392) done
remote:   72% (283/392) done
remote:   73% (287/392) done
remote:   74% (291/392) done
remote:   75% (294/392) done
remote:   76% (298/392) done
remote:   77% (302/392) done
remote:   78% (306/392) done
remote:   79% (310/392) done
remote:   80% (314/392) done
remote:   81% (318/392) done
remote:   82% (322/392) done
remote:   83% (326/392) done
remote:   84% (330/392) done
remote:   85% (334/392) done
remote:   86% (338/392) done
remote:   87% (342/392) done
remote:   88% (345/392) done
remote:   89% (349/392) done
remote:   90% (353/392) done
remote:   91% (357/392) done
remote:   92% (361/392) done
remote:   93% (365/392) done
remote:   94% (369/392) done
remote:   95% (373/392) done
remote:   96% (377/392) done
remote:   97% (381/392) done
remote:   98% (385/392) done
remote:   99% (389/392) done
remote:  100% (392/392) done
remote: 
Receiving objects:   0% (1/392)   
Receiving objects:   1% (4/392)   
Receiving objects:   2% (8/392)   
Receiving objects:   3% (12/392)   
Receiving objects:   4% (16/392)   
Receiving objects:   5% (20/392)   
Receiving objects:   6% (24/392)   
Receiving objects:   7% (28/392)   
Receiving objects:   8% (32/392)   
Receiving objects:   9% (36/392)   
Receiving objects:  10% (40/392)   
Receiving objects:  11% (44/392)   
Receiving objects:  12% (48/392)   
Receiving objects:  13% (51/392)   
Receiving objects:  14% (55/392)   
Receiving objects:  15% (59/392)   
Receiving objects:  16% (63/392)   
Receiving objects:  17% (67/392)   
Receiving objects:  18% (71/392)   
Receiving objects:  19% (75/392)   
Receiving objects:  20% (79/392)   
Receiving objects:  21% (83/392)   
Receiving objects:  22% (87/392)   
Receiving objects:  23% (91/392)   
Receiving objects:  24% (95/392)   
Receiving objects:  25% (98/392)   
Receiving objects:  26% (102/392)   
remote: Total 392 (delta 335), reused 356 (delta 300)
Receiving objects:  27% (106/392)   
Receiving objects:  28% (110/392)   
Receiving objects:  29% (114/392)   
Receiving objects:  30% (118/392)   
Receiving objects:  31% (122/392)   
Receiving objects:  32% (126/392)   
Receiving objects:  33% (130/392)   
Receiving objects:  34% (134/392)   
Receiving objects:  35% (138/392)   
Receiving objects:  36% (142/392)   
Receiving objects:  37% (146/392)   
Receiving objects:  38% (149/392)   
Receiving objects:  39% (153/392)   
Receiving objects:  40% (157/392)   
Receiving objects:  41% (161/392)   
Receiving objects:  42% (165/392)   
Receiving objects:  43% (169/392)   
Receiving objects:  44% (173/392)   
Receiving objects:  45% (177/392)   
Receiving objects:  46% (181/392)   
Receiving objects:  47% (185/392)   
Receiving objects:  48% (189/392)   
Receiving objects:  49% (193/392)   
Receiving objects:  50% (196/392)   
Receiving objects:  51% (200/392)   
Receiving objects:  52% (204/392)   
Receiving objects:  53% (208/392)   
Receiving objects:  54% (212/392)   
Receiving objects:  55% (216/392)   
Receiving objects:  56% (220/392)   
Receiving objects:  57% (224/392)   
Receiving objects:  58% (228/392)   
Receiving objects:  59% (232/392)   
Receiving objects:  60% (236/392)   
Receiving objects:  61% (240/392)   
Receiving objects:  62% (244/392)   
Receiving objects:  63% (247/392)   
Receiving objects:  64% (251/392)   
Receiving objects:  65% (255/392)   
Receiving objects:  66% (259/392)   
Receiving objects:  67% (263/392)   
Receiving objects:  68% (267/392)   
Receiving objects:  69% (271/392)   
Receiving objects:  70% (275/392)   
Receiving objects:  71% (279/392)   
Receiving objects:  72% (283/392)   
Receiving objects:  73% (287/392)   
Receiving objects:  74% (291/392)   
Receiving objects:  75% (294/392)   
Receiving objects:  76% (298/392)   
Receiving objects:  77% (302/392)   
Receiving objects:  78% (306/392)   
Receiving objects:  79% (310/392)   
Receiving objects:  80% (314/392)   
Receiving objects:  81% (318/392)   
Receiving objects:  82% (322/392)   
Receiving objects:  83% (326/392)   
Receiving objects:  84% (330/392)   
Receiving objects:  85% (334/392)   
Receiving objects:  86% (338/392)   
Receiving objects:  87% (342/392)   
Receiving objects:  88% (345/392)   
Receiving objects:  89% (349/392)   
Receiving objects:  90% (353/392)   
Receiving objects:  91% (357/392)   
Receiving objects:  92% (361/392)   
Receiving objects:  93% (365/392)   
Receiving objects:  94% (369/392)   
Receiving objects:  95% (373/392)   
Receiving objects:  96% (377/392)   
Receiving objects:  97% (381/392)   
Receiving objects:  98% (385/392)   
Receiving objects:  99% (389/392)   
Receiving objects: 100% (392/392)   
Receiving objects: 100% (392/392), 67.06 KiB, done.
Resolving deltas:   0% (1/335)   
Resolving deltas:   1% (6/335)   
Resolving deltas:   3% (11/335)   
Resolving deltas:   4% (15/335)   
Resolving deltas:   6% (21/335)   
Resolving deltas:   7% (25/335)   
Resolving deltas:   8% (27/335)   
Resolving deltas:  14% (50/335)   
Resolving deltas:  21% (72/335)   
Resolving deltas:  22% (75/335)   
Resolving deltas:  24% (83/335)   
Resolving deltas:  25% (84/335)   
Resolving deltas:  26% (90/335)   
Resolving deltas:  27% (91/335)   
Resolving deltas:  34% (114/335)   
Resolving deltas:  35% (118/335)   
Resolving deltas:  36% (121/335)   
Resolving deltas:  37% (124/335)   
Resolving deltas:  38% (130/335)   
Resolving deltas:  39% (132/335)   
Resolving deltas:  40% (134/335)   
Resolving deltas:  41% (139/335)   
Resolving deltas:  42% (142/335)   
Resolving deltas:  44% (150/335)   
Resolving deltas:  46% (156/335)   
Resolving deltas:  48% (162/335)   
Resolving deltas:  49% (165/335)   
Resolving deltas:  50% (168/335)   
Resolving deltas:  51% (171/335)   
Resolving deltas:  53% (180/335)   
Resolving deltas:  55% (187/335)   
Resolving deltas:  56% (190/335)   
Resolving deltas:  57% (191/335)   
Resolving deltas:  58% (195/335)   
Resolving deltas:  62% (208/335)   
Resolving deltas:  63% (212/335)   
Resolving deltas:  65% (220/335)   
Resolving deltas:  66% (223/335)   
Resolving deltas:  68% (230/335)   
Resolving deltas:  70% (236/335)   
Resolving deltas:  71% (238/335)   
Resolving deltas:  72% (242/335)   
Resolving deltas:  75% (252/335)   
Resolving deltas:  80% (268/335)   
Resolving deltas:  82% (277/335)   
Resolving deltas:  83% (279/335)   
Resolving deltas:  86% (290/335)   
Resolving deltas:  89% (300/335)   
Resolving deltas:  93% (312/335)   
Resolving deltas:  96% (322/335)   
Resolving deltas:  97% (327/335)   
Resolving deltas:  98% (330/335)   
Resolving deltas:  99% (332/335)   
Resolving deltas: 100% (335/335)   
Resolving deltas: 100% (335/335), completed with 65 local objects.
From git://git.linux-nfs.org/projects/trondmy/nfs-2.6
   ccd9e86..5d34d13  linux-next -> nfs
remote: Counting objects: 1   
remote: Counting objects: 97, done.
remote: Compressing objects:   1% (1/54)   
remote: Compressing objects:   3% (2/54)   
remote: Compressing objects:   5% (3/54)   
remote: Compressing objects:remote:    7% (4/54)   
remote: Compressing objects:   9% (5/54)   
remote: Compressing objects:  11% (6/54)   
remote: Compressing objects:  12% (7/54)   
remote: Compremote: ressing objects:  14% (8/54)   
remote: Compressing objects:  16% (9/54)   
remote: Compressing objects:  18% (10/54)   
remote: Compressing objects:  20% (11/54)   
remote: Compressing objects:  22% (12/54)   
remote: Compressing objects:  24% (13/54)   
remote: Compressing objects:  25% (14/54)   
remote: Compressing objects:  27% (15/54)   
remote: Compressing objects:  29% (16/54)   
remote: Compressing objects:  31% (17/54)   
remote: Compressing objects:  33% (18/54)   
remote: Compressing objects:  35% (19/54)   
remote: Compressing objects:  37% (20/54)   
remote: Compressing objects:  38% (21/54)   
remote: Compressing objects:  40% (22/54)   
remote: Compressing objects:  42% (23/54)   
remote: Compressing objects:  44% (24/54)   
remote: Compressing objects:  46% (25/54)   
remote: Compressing objects:  48% (26/54)   
remote: Compressing objects:  50% (27/54)   
remote: Compressing objects:  51% (28/54)   
remote: Compressing objects:  53% (29/54)   
remote: Compressing objects:  55% (30/54)   
remote: Compressing objects:  57% (31/54)   
remote: Compressing objects:  59% (32/54)   
remote: Compressing objects:  61% (33/54)   
remote: Compressing objects:  62% (34/54)   
remote: Compressing objects:  64% (35/54)   
remote: Compressing objects:  66% (36/54)   
remote: Compressing objects:  68% (37/54)   
remote: Compressing objects:  70% (38/54)   
remote: Compressing objects:  72% (39/54)   
remote: Compressing objects:  74% (40/54)   
remote: Compressing objects:  75% (41/54)   
remote: Compressing objects:  77% (42/54)   
remote: Compressing objects:  79% (43/54)   
remote: Compressing objects:  81% (44/54)   
remote: Compressing objects:  83% (45/54)   
remote: Compressing objects:  85% (46/54)   
remote: Compressing objects:  87% (47/54)   
remote: Compressing objects:  88% (48/54)   
remote: Compressing objects:  90% (49/54)   
remote: Compressing objects:  92% (50/54)   
remote: Compressing objects:  94% (51/54)   
remote: Compressing objects:  96% (52/54)   
remote: Compressing objects:  98% (53/54)   
remote: Compressing objects: 100% (54/54)   
remote: Compressing objects: 100% (54/54), done.
remote: Total 72 (delta 59), reused 23 (delta 18)
From /pub/scm/linux/kernel/git/jmorris/selinux-2.6
 * [new branch]      for-akpm   -> selinux
Already on branch "2.6.25-rc6-mc11"
Automatic merge failed; fix conflicts and then commit the result.
remote: Counting objects: 4159, done.
remote: Compressing objects:   0% (1/567)   
remote: Compressing objects:   1% (6/567)   
remote: Compressing objects:   2% (12/567)   
remote: Compressing objects:   3% (18/567)   
remote: Compressing objects:   4% (23/567)   
remote: Compressing objects:   5% (29/567)   
remote: Compressing objects:   6% (35/567)   
remote: Compressing objects:   7% (40/567)   
remote: Compressing objects:   8% (46/567)   
remote: Compressing objects:   9% (52/567)   
remote: Compressing objects:  10% (57/567)   
remote: Compressing objects:  11% (63/567)   
remote: Compressing objects:  12% (69/567)   
remote: Compressing objects:  13% (74/567)   
remote: Compressing objects:  14% (80/567)   
remote: Compressing objects:  15% (86/567)   
remote: Compressing objects:  16% (91/567)   
remote: Compressing objects:  17% (97/567)   
remote: Compressing objects:  18% (103/567)   
remote: Compressing objects:  19% (108/567)   
remote: Compressing objects:  20% (114/567)   
remote: Compressing objects:  21% (120/567)   
remote: Compressing objects:  22% (125/567)   
remote: Compressing objects:  23% (131/567)   
remote: Compressing objects:  24% (137/567)   
remote: Compressing objects:  25% (142/567)   
remote: Compressing objects:  26% (148/567)   
remote: Compressing objects:  27% (154/567)   
remote: Compressing objects:  28% (159/567)   
remote: Compressing objects:  29% (165/567)   
remote: Compressing objects:  30% (171/567)   
remote: Compressing objects:  31% (176/567)   
remote: Compressing objects:  32% (182/567)   
remote: Compressing objects:  33% (188/567)   
remote: Compressing objects:  34% (193/567)   
remote: Compressing objects:  35% (199/567)   
remote: Compressing objects:  36% (205/567)   
remote: Compressing objects:  37% (210/567)   
remote: Compressing objects:  38% (216/567)   
remote: Compressing objects:  39% (222/567)   
remote: Compressing objects:  40% (227/567)   
remote: Compressing objects:  41% (233/567)   
remote: Compressing objects:  42% (239/567)   
remote: Compressing objects:  43% (244/567)   
remote: Compressing objects:  44% (250/567)   
remote: Compressing objects:  45% (256/567)   
remote: Compressing objects:  46% (261/567)   
remote: Compressing objects:  47% (267/567)   
remote: Compressing objects:  48% (273/567)   
remote: Compressing objects:  49% (278/567)   
remote: Compressing objects:  50% (284/567)   
remote: Compressing objects:  51% (290/567)   
remote: Compressing objects:  52% (295/567)   
remote: Compressing objects:  53% (301/567)   
remote: Compressing objects:  54% (307/567)   
remote: Compressing objects:  55% (312/567)   
remote: Compressing objects:  56% (318/567)   
remote: Compressing objects:  57% (324/567)   
remote: Compressing objects:  58% (329/567)   
remote: Compressing objects:  59% (335/567)   
remote: Compressing objects:  60% (341/567)   
remote: Compressing objects:  61% (346/567)   
remote: Compressing objects:  62% (352/567)   
remote: Compressing objects:  63% (358/567)   
remote: Compressing objects:  64% (363/567)   
remote: Compressing objects:  65% (369/567)   
remote: Compressing objects:  66% (375/567)   
remote: Compressing objects:  67% (380/567)   
remote: Compressing objects:  68% (386/567)   
remote: Compressing objects:  69% (392/567)   
remote: Compressing objects:  70% (397/567)   
remote: Compressing objects:  71% (403/567)   
remote: Compressing objects:  72% (409/567)   
remote: Compressing objects:  73% (414/567)   
remote: Compressing objects:  74% (420/567)   
remote: Compressing objects:  75% (426/567)   
remote: Compressing objects:  76% (431/567)   
remote: Compressing objects:  77% (437/567)   
remote: Compressing objects:  78% (443/567)   
remote: Compressing objects:  79% (448/567)   
remote: Compressing objects:  80% (454/567)   
remote: Compressing objects:  81% (460/567)   
remote: Compressing objects:  82% (465/567)   
remote: Compressing objects:  83% (471/567)   
remote: Compressing objects:  84% (477/567)   
remote: Compressing objects:  85% (482/567)   
remote: Compressing objects:  86% (488/567)   
remote: Compressing objects:  87% (494/567)   
remote: Compressing objects:  88% (499/567)   
remote: Compressing objects:  89% (505/567)   
remote: Compressing objects:  90% (511/567)   
remote: Compressing objects:  91% (516/567)   
remote: Compressing objects:  92% (522/567)   
remote: Compressing objects:  93% (528/567)   
remote: Compressing objects:  94% (533/567)   
remote: Compressing objects:  95% (539/567)   
remote: Compressing objects:  96% (545/567)   
remote: Compressing objects:  97% (550/567)   
remote: Compressing objects:  98% (556/567)   
remote: Compressing objects:  99% (562/567)   
remote: Compressing objects: 100% (567/567)   
remote: Compressing objects: 100% (567/567), done.
Receiving objects:   0% (1/3758)   
Receiving objects:   1% (38/3758)   
Receiving objects:   2% (76/3758)   
Receiving objects:   3% (113/3758)   
Receiving objects:   4% (151/3758)   
Receiving objects:   5% (188/3758)   
Receiving objects:   6% (226/3758)   
Receiving objects:   7% (264/3758)   
Receiving objects:   8% (301/3758)   
Receiving objects:   9% (339/3758)   
Receiving objects:  10% (376/3758)   
Receiving objects:  11% (414/3758)   
Receiving objects:  12% (451/3758)   
Receiving objects:  13% (489/3758)   
Receiving objects:  14% (527/3758)   
Receiving objects:  15% (564/3758)   
Receiving objects:  16% (602/3758)   
Receiving objects:  17% (639/3758)   
Receiving objects:  18% (677/3758)   
Receiving objects:  19% (715/3758)   
Receiving objects:  20% (752/3758)   
Receiving objects:  21% (790/3758)   
Receiving objects:  22% (827/3758)   
Receiving objects:  23% (865/3758)   
Receiving objects:  24% (902/3758)   
Receiving objects:  25% (940/3758)   
Receiving objects:  26% (978/3758)   
Receiving objects:  27% (1015/3758)   
Receiving objects:  28% (1053/3758)   
Receiving objects:  29% (1090/3758)   
Receiving objects:  30% (1128/3758)   
Receiving objects:  31% (1165/3758)   
Receiving objects:  32% (1203/3758)   
Receiving objects:  33% (1241/3758)   
Receiving objects:  34% (1278/3758)   
Receiving objects:  35% (1316/3758)   
Receiving objects:  36% (1353/3758)   
Receiving objects:  37% (1391/3758)   
Receiving objects:  38% (1429/3758)   
Receiving objects:  39% (1466/3758)   
Receiving objects:  40% (1504/3758)   
Receiving objects:  41% (1541/3758)   
Receiving objects:  42% (1579/3758)   
Receiving objects:  43% (1616/3758)   
Receiving objects:  44% (1654/3758)   
Receiving objects:  45% (1692/3758)   
Receiving objects:  46% (1729/3758)   
Receiving objects:  47% (1767/3758)   
Receiving objects:  48% (1804/3758)   
Receiving objects:  49% (1842/3758)   
Receiving objects:  50% (1879/3758)   
Receiving objects:  51% (1917/3758)   
Receiving objects:  52% (1955/3758)   
Receiving objects:  53% (1992/3758)   
Receiving objects:  54% (2030/3758)   
Receiving objects:  55% (2067/3758)   
Receiving objects:  56% (2105/3758)   
remote: Total 3758 (delta 3217), reused 3729 (delta 3188)
Receiving objects:  57% (2143/3758)   
Receiving objects:  58% (2180/3758)   
Receiving objects:  59% (2218/3758)   
Receiving objects:  60% (2255/3758)   
Receiving objects:  61% (2293/3758)   
Receiving objects:  62% (2330/3758)   
Receiving objects:  63% (2368/3758)   
Receiving objects:  64% (2406/3758)   
Receiving objects:  65% (2443/3758)   
Receiving objects:  66% (2481/3758)   
Receiving objects:  67% (2518/3758)   
Receiving objects:  68% (2556/3758)   
Receiving objects:  69% (2594/3758)   
Receiving objects:  70% (2631/3758)   
Receiving objects:  71% (2669/3758)   
Receiving objects:  72% (2706/3758)   
Receiving objects:  73% (2744/3758)   
Receiving objects:  74% (2781/3758)   
Receiving objects:  75% (2819/3758)   
Receiving objects:  76% (2857/3758)   
Receiving objects:  77% (2894/3758)   
Receiving objects:  78% (2932/3758)   
Receiving objects:  79% (2969/3758)   
Receiving objects:  80% (3007/3758)   
Receiving objects:  81% (3044/3758)   
Receiving objects:  82% (3082/3758)   
Receiving objects:  83% (3120/3758)   
Receiving objects:  84% (3157/3758)   
Receiving objects:  85% (3195/3758)   
Receiving objects:  86% (3232/3758)   
Receiving objects:  87% (3270/3758)   
Receiving objects:  88% (3308/3758)   
Receiving objects:  89% (3345/3758)   
Receiving objects:  90% (3383/3758)   
Receiving objects:  91% (3420/3758)   
Receiving objects:  92% (3458/3758)   
Receiving objects:  93% (3495/3758)   
Receiving objects:  94% (3533/3758)   
Receiving objects:  95% (3571/3758)   
Receiving objects:  96% (3608/3758)   
Receiving objects:  97% (3646/3758)   
Receiving objects:  98% (3683/3758)   
Receiving objects:  99% (3721/3758)   
Receiving objects: 100% (3758/3758)   
Receiving objects: 100% (3758/3758), 593.46 KiB, done.
Resolving deltas:   0% (1/3217)   
Resolving deltas:   2% (89/3217)   
Resolving deltas:  10% (327/3217)   
Resolving deltas:  11% (362/3217)   
Resolving deltas:  12% (387/3217)   
Resolving deltas:  13% (440/3217)   
Resolving deltas:  14% (452/3217)   
Resolving deltas:  15% (502/3217)   
Resolving deltas:  16% (515/3217)   
Resolving deltas:  17% (547/3217)   
Resolving deltas:  20% (659/3217)   
Resolving deltas:  22% (731/3217)   
Resolving deltas:  23% (756/3217)   
Resolving deltas:  27% (870/3217)   
Resolving deltas:  42% (1352/3217)   
Resolving deltas:  55% (1776/3217)   
Resolving deltas:  56% (1812/3217)   
Resolving deltas:  57% (1835/3217)   
Resolving deltas:  58% (1880/3217)   
Resolving deltas:  59% (1899/3217)   
Resolving deltas:  60% (1933/3217)   
Resolving deltas:  61% (1965/3217)   
Resolving deltas:  62% (1996/3217)   
Resolving deltas:  63% (2028/3217)   
Resolving deltas:  64% (2060/3217)   
Resolving deltas:  65% (2098/3217)   
Resolving deltas:  66% (2125/3217)   
Resolving deltas:  67% (2156/3217)   
Resolving deltas:  68% (2189/3217)   
Resolving deltas:  69% (2220/3217)   
Resolving deltas:  70% (2257/3217)   
Resolving deltas:  71% (2288/3217)   
Resolving deltas:  72% (2320/3217)   
Resolving deltas:  73% (2351/3217)   
Resolving deltas:  78% (2522/3217)   
Resolving deltas:  82% (2668/3217)   
Resolving deltas:  83% (2675/3217)   
Resolving deltas:  84% (2703/3217)   
Resolving deltas:  85% (2736/3217)   
Resolving deltas:  86% (2768/3217)   
Resolving deltas:  87% (2800/3217)   
Resolving deltas:  88% (2833/3217)   
Resolving deltas:  89% (2877/3217)   
Resolving deltas:  90% (2896/3217)   
Resolving deltas:  91% (2929/3217)   
Resolving deltas:  92% (2962/3217)   
Resolving deltas:  94% (3041/3217)   
Resolving deltas:  95% (3081/3217)   
Resolving deltas:  96% (3090/3217)   
Resolving deltas:  98% (3163/3217)   
Resolving deltas:  99% (3213/3217)   
Resolving deltas: 100% (3217/3217)   
Resolving deltas: 100% (3217/3217), completed with 370 local objects.
From /pub/scm/linux/kernel/git/x86/linux-2.6-x86
 + d7755b0...c4feef8 master     -> x86  (forced update)
Switched to branch "x86"
Finished one revert.
Switched to branch "2.6.25-rc6-mc11"
Already on branch "2.6.25-rc6-mc11"
Automatic merge failed; fix conflicts and then commit the result.
Switched to branch "doc"
Switched to branch "2.6.25-rc6-mc11"
Already on branch "2.6.25-rc6-mc11"
Already on branch "2.6.25-rc6-mc11"
remote: Counting objects: 401, done.
remote: Compressing objects:   1% (1/58)   
remote: Compressing objects:   3% (2/58)   
remote: Compressing objects:   5% (3/58)   
remote: Compressing objects:   6% (4/58)   
remote: Compressing objects:   8% (5/58)   
remote: Compressing objects:  10% (6/58)   
remote: Compressing objects:  12% (7/58)   
remote: Compressing objects:  13% (8/58)   
remote: Compressing objects:  15% (9/58)   
remote: Compressing objects:  17% (10/58)   
remote: Compressing objects:  18% (11/58)   
remote: Compressing objects:  20% (12/58)   
remote: Compressing objects:  22% (13/58)   
remote: Compressing objects:  24% (14/58)   
remote: Compressing objects:  25% (15/58)   
remote: Compressing objects:  27% (16/58)   
remote: Compressing objects:  29% (17/58)   
remote: Compressing objects:  31% (18/58)   
remote: Compressing objects:  32% (19/58)   
remote: Compressing objects:  34% (20/58)   
remote: Compressing objects:  36% (21/58)   
remote: Compressing objects:  37% (22/58)   
remote: Compressing objects:  39% (23/58)   
remote: Compressing objects:  41% (24/58)   
remote: Compressing objects:  43% (25/58)   
remote: Compressing objects:  44% (26/58)   
remote: Compressing objects:  46% (27/58)   
remote: Compressing objects:  48% (28/58)   
remote: Compressing objects:  50% (29/58)   
remote: Compressing objects:  51% (30/58)   
remote: Compressing objects:  53% (31/58)   
remote: Compressing objects:  55% (32/58)   
remote: Compressing objects:  56% (33/58)   
remote: Compressing objects:  58% (34/58)   
remote: Compressing objects:  60% (35/58)   
remote: Compressing objects:  62% (36/58)   
remote: Compressing objects:  63% (37/58)   
remote: Compressing objects:  65% (38/58)   
remote: Compressing objects:  67% (39/58)   
remote: Compressing objects:  68% (40/58)   
remote: Compressing objects:  70% (41/58)   
remote: Compressing objects:  72% (42/58)   
remote: Compressing objects:  74% (43/58)   
remote: Compressing objects:  75% (44/58)   
remote: Compressing objects:  77% (45/58)   
remote: Compressing objects:  79% (46/58)   
remote: Compressing objects:  81% (47/58)   
remote: Compressing objects:  82% (48/58)   
remote: Compressing objects:  84% (49/58)   
remote: Compressing objects:  86% (50/58)   
remote: Compressing objects:  87% (51/58)   
remote: Compressing objects:  89% (52/58)   
remote: Compressing objects:  91% (53/58)   
remote: Compressing objects:  93% (54/58)   
remote: Compressing objects:  94% (55/58)   
remote: Compressing objects:  96% (56/58)   
remote: Compressing objects:  98% (57/58)   
remote: Compressing objects: 100% (58/58)   
remote: Compressing objects: 100% (58/58), done.
Receiving objects:   0% (1/300)   
Receiving objects:   1% (3/300)   
Receiving objects:   2% (6/300)   
Receiving objects:   3% (9/300)   
Receiving objects:   4% (12/300)   
Receiving objects:   5% (15/300)   
Receiving objects:   6% (18/300)   
Receiving objects:   7% (21/300)   
Receiving objects:   8% (24/300)   
Receiving objects:   9% (27/300)   
Receiving objects:  10% (30/300)   
Receiving objects:  11% (33/300)   
Receiving objects:  12% (36/300)   
remote: Total 300 (delta 265), reused 273 (delta 242)
Receiving objects:  13% (39/300)   
Receiving objects:  14% (42/300)   
Receiving objects:  15% (45/300)   
Receiving objects:  16% (48/300)   
Receiving objects:  17% (51/300)   
Receiving objects:  18% (54/300)   
Receiving objects:  19% (57/300)   
Receiving objects:  20% (60/300)   
Receiving objects:  21% (63/300)   
Receiving objects:  22% (66/300)   
Receiving objects:  23% (69/300)   
Receiving objects:  24% (72/300)   
Receiving objects:  25% (75/300)   
Receiving objects:  26% (78/300)   
Receiving objects:  27% (81/300)   
Receiving objects:  28% (84/300)   
Receiving objects:  29% (87/300)   
Receiving objects:  30% (90/300)   
Receiving objects:  31% (93/300)   
Receiving objects:  32% (96/300)   
Receiving objects:  33% (99/300)   
Receiving objects:  34% (102/300)   
Receiving objects:  35% (105/300)   
Receiving objects:  36% (108/300)   
Receiving objects:  37% (111/300)   
Receiving objects:  38% (114/300)   
Receiving objects:  39% (117/300)   
Receiving objects:  40% (120/300)   
Receiving objects:  41% (123/300)   
Receiving objects:  42% (126/300)   
Receiving objects:  43% (129/300)   
Receiving objects:  44% (132/300)   
Receiving objects:  45% (135/300)   
Receiving objects:  46% (138/300)   
Receiving objects:  47% (141/300)   
Receiving objects:  48% (144/300)   
Receiving objects:  49% (147/300)   
Receiving objects:  50% (150/300)   
Receiving objects:  51% (153/300)   
Receiving objects:  52% (156/300)   
Receiving objects:  53% (159/300)   
Receiving objects:  54% (162/300)   
Receiving objects:  55% (165/300)   
Receiving objects:  56% (168/300)   
Receiving objects:  57% (171/300)   
Receiving objects:  58% (174/300)   
Receiving objects:  59% (177/300)   
Receiving objects:  60% (180/300)   
Receiving objects:  61% (183/300)   
Receiving objects:  62% (186/300)   
Receiving objects:  63% (189/300)   
Receiving objects:  64% (192/300)   
Receiving objects:  65% (195/300)   
Receiving objects:  66% (198/300)   
Receiving objects:  67% (201/300)   
Receiving objects:  68% (204/300)   
Receiving objects:  69% (207/300)   
Receiving objects:  70% (210/300)   
Receiving objects:  71% (213/300)   
Receiving objects:  72% (216/300)   
Receiving objects:  73% (219/300)   
Receiving objects:  74% (222/300)   
Receiving objects:  75% (225/300)   
Receiving objects:  76% (228/300)   
Receiving objects:  77% (231/300)   
Receiving objects:  78% (234/300)   
Receiving objects:  79% (237/300)   
Receiving objects:  80% (240/300)   
Receiving objects:  81% (243/300)   
Receiving objects:  82% (246/300)   
Receiving objects:  83% (249/300)   
Receiving objects:  84% (252/300)   
Receiving objects:  85% (255/300)   
Receiving objects:  86% (258/300)   
Receiving objects:  87% (261/300)   
Receiving objects:  88% (264/300)   
Receiving objects:  89% (267/300)   
Receiving objects:  90% (270/300)   
Receiving objects:  91% (273/300)   
Receiving objects:  92% (276/300)   
Receiving objects:  93% (279/300)   
Receiving objects:  94% (282/300)   
Receiving objects:  95% (285/300)   
Receiving objects:  96% (288/300)   
Receiving objects:  97% (291/300)   
Receiving objects:  98% (294/300)   
Receiving objects:  99% (297/300)   
Receiving objects: 100% (300/300)   
Receiving objects: 100% (300/300), 47.99 KiB, done.
Resolving deltas:   0% (1/265)   
Resolving deltas:   2% (6/265)   
Resolving deltas:   4% (12/265)   
Resolving deltas:   5% (14/265)   
Resolving deltas:   6% (18/265)   
Resolving deltas:   7% (19/265)   
Resolving deltas:   8% (23/265)   
Resolving deltas:   9% (24/265)   
Resolving deltas:  10% (27/265)   
Resolving deltas:  11% (31/265)   
Resolving deltas:  12% (32/265)   
Resolving deltas:  13% (36/265)   
Resolving deltas:  14% (38/265)   
Resolving deltas:  15% (41/265)   
Resolving deltas:  16% (43/265)   
Resolving deltas:  17% (46/265)   
Resolving deltas:  18% (49/265)   
Resolving deltas:  19% (51/265)   
Resolving deltas:  20% (53/265)   
Resolving deltas:  21% (56/265)   
Resolving deltas:  22% (59/265)   
Resolving deltas:  23% (61/265)   
Resolving deltas:  24% (64/265)   
Resolving deltas:  25% (67/265)   
Resolving deltas:  26% (69/265)   
Resolving deltas:  27% (73/265)   
Resolving deltas:  28% (75/265)   
Resolving deltas:  29% (79/265)   
Resolving deltas:  30% (80/265)   
Resolving deltas:  31% (84/265)   
Resolving deltas:  32% (85/265)   
Resolving deltas:  33% (88/265)   
Resolving deltas:  34% (91/265)   
Resolving deltas:  38% (102/265)   
Resolving deltas:  39% (104/265)   
Resolving deltas:  40% (106/265)   
Resolving deltas:  41% (109/265)   
Resolving deltas:  42% (112/265)   
Resolving deltas:  43% (114/265)   
Resolving deltas:  44% (117/265)   
Resolving deltas:  45% (120/265)   
Resolving deltas:  46% (122/265)   
Resolving deltas:  61% (164/265)   
Resolving deltas:  62% (166/265)   
Resolving deltas:  63% (167/265)   
Resolving deltas:  77% (205/265)   
Resolving deltas:  78% (207/265)   
Resolving deltas:  91% (242/265)   
Resolving deltas:  92% (244/265)   
Resolving deltas:  93% (248/265)   
Resolving deltas:  94% (251/265)   
Resolving deltas:  96% (257/265)   
Resolving deltas:  97% (259/265)   
Resolving deltas:  99% (263/265)   
Resolving deltas: 100% (265/265)   
Resolving deltas: 100% (265/265), completed with 94 local objects.
From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6
 + 5af0590...efbbac4 master     -> scsi-postmerge  (forced update)
20 --
 arch/avr32/kernel/process.c            |    4 +-
 arch/avr32/kernel/time.c               |  248 +++++++++-----------------
 arch/avr32/kernel/traps.c              |    4 +
 arch/avr32/mach-at32ap/Makefile        |    3 +-
 arch/avr32/mach-at32ap/at32ap700x.c    |  243 +++++++++++++++++++++++--
 arch/avr32/mach-at32ap/intc.c          |    1 -
 arch/avr32/mach-at32ap/pm-at32ap700x.S |   66 +++++++
 arch/avr32/mach-at32ap/time-tc.c       |  218 -----------------------
 arch/avr32/oprofile/op_model_avr32.c   |    1 -
 drivers/char/keyboard.c                |    3 +-
 drivers/clocksource/Makefile           |    1 +
 drivers/clocksource/tcb_clksrc.c       |  305 ++++++++++++++++++++++++++++++++
 drivers/misc/Kconfig                   |   33 ++++
 drivers/misc/Makefile                  |    1 +
 drivers/misc/atmel_tclib.c             |  161 +++++++++++++++++
 drivers/usb/gadget/atmel_usba_udc.c    |  126 +++++---------
 include/asm-avr32/arch-at32ap/board.h  |    9 +-
 include/asm-avr32/arch-at32ap/pm.h     |   48 +++++
 include/asm-avr32/arch-at32ap/time.h   |  112 ------------
 include/asm-avr32/asm.h                |    8 +-
 include/asm-avr32/byteorder.h          |    6 +
 include/asm-avr32/intc.h               |  128 -------------
 include/asm-avr32/irq.h                |    5 +
 include/asm-avr32/page.h               |    8 +-
 include/asm-avr32/processor.h          |    2 +-
 include/linux/atmel_tc.h               |  252 ++++++++++++++++++++++++++
 include/linux/usb/atmel_usba_udc.h     |   22 +++
 29 files changed, 1278 insertions(+), 765 deletions(-)
 create mode 100644 arch/avr32/mach-at32ap/pm-at32ap700x.S
 delete mode 100644 arch/avr32/mach-at32ap/time-tc.c
 create mode 100644 drivers/clocksource/tcb_clksrc.c
 create mode 100644 drivers/misc/atmel_tclib.c
 create mode 100644 include/asm-avr32/arch-at32ap/pm.h
 delete mode 100644 include/asm-avr32/arch-at32ap/time.h
 delete mode 100644 include/asm-avr32/intc.h
 create mode 100644 include/linux/atmel_tc.h
 create mode 100644 include/linux/usb/atmel_usba_udc.h
##
# git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git	master		cifs
##
Merge made by recursive.
 fs/cifs/cifs_dfs_ref.c |   18 +++---
 fs/cifs/cifsacl.c      |   25 +++++---
 fs/cifs/cifsproto.h    |    9 ++-
 fs/cifs/dir.c          |    5 +-
 fs/cifs/dns_resolve.c  |    8 +-
 fs/cifs/file.c         |    4 +-
 fs/cifs/inode.c        |  157 ++++++++++++++++++++++++++----------------------
 fs/cifs/link.c         |    2 +-
 8 files changed, 125 insertions(+), 103 deletions(-)
##
# git /pub/scm/linux/kernel/git/davej/cpufreq.git		master		cpufreq
##
Merge made by recursive.
 drivers/acpi/processor_thermal.c |   30 +++++----
 drivers/cpufreq/cpufreq.c        |  129 +++++++++++++++++---------------------
 drivers/cpufreq/cpufreq_stats.c  |    6 ++-
 3 files changed, 78 insertions(+), 87 deletions(-)
##
# git /pub/scm/linux/kernel/git/agk/linux-2.6-dm.git	master		dm
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/paulus/powerpc.git	master		powerpc
##
Auto-merged arch/powerpc/platforms/cell/iommu.c
Auto-merged arch/powerpc/platforms/powermac/setup.c
Merge made by recursive.
 arch/powerpc/Kconfig                    |    1 +
 arch/powerpc/kernel/btext.c             |    3 +-
 arch/powerpc/kernel/crash.c             |    3 +-
 arch/powerpc/kernel/crash_dump.c        |    3 +-
 arch/powerpc/kernel/head_32.S           |   17 --
 arch/powerpc/kernel/machine_kexec.c     |    3 +-
 arch/powerpc/kernel/prom.c              |    2 +-
 arch/powerpc/kernel/rtas.c              |    2 +-
 arch/powerpc/kernel/setup-common.c      |    2 +-
 arch/powerpc/kernel/setup_64.c          |    2 +-
 arch/powerpc/kernel/vdso.c              |    3 +-
 arch/powerpc/mm/Makefile                |    2 +-
 arch/powerpc/mm/hash_utils_64.c         |   26 +++-
 arch/powerpc/mm/init_32.c               |    2 +-
 arch/powerpc/mm/init_64.c               |    2 +-
 arch/powerpc/mm/mem.c                   |    2 +-
 arch/powerpc/mm/numa.c                  |    3 +-
 arch/powerpc/mm/ppc_mmu_32.c            |    2 +-
 arch/powerpc/mm/stab.c                  |    4 +-
 arch/powerpc/platforms/8xx/m8xx_setup.c |    7 +-
 arch/powerpc/platforms/cell/iommu.c     |    2 +-
 arch/powerpc/platforms/maple/setup.c    |    2 +-
 arch/powerpc/platforms/pasemi/dma_lib.c |  144 ++++++++++++++
 arch/powerpc/platforms/powermac/setup.c |    2 +-
 arch/powerpc/platforms/ps3/htab.c       |    3 +-
 arch/powerpc/platforms/ps3/mm.c         |    3 +-
 arch/powerpc/platforms/ps3/os-area.c    |    3 +-
 arch/powerpc/platforms/pseries/lpar.c   |   15 ++
 arch/powerpc/sysdev/dart_iommu.c        |    2 +-
 arch/powerpc/sysdev/mpic.c              |   32 ++--
 arch/ppc/8xx_io/commproc.c              |    2 +-
 arch/ppc/kernel/head.S                  |   17 --
 arch/sparc64/Kconfig                    |    1 +
 drivers/net/Makefile                    |    3 +-
 drivers/net/pasemi_mac.c                |  324 +++++++++++++++++++++++++------
 drivers/net/pasemi_mac.h                |   35 ++++-
 drivers/net/pasemi_mac_ethtool.c        |  159 +++++++++++++++
 include/asm-powerpc/abs_addr.h          |    3 +-
 include/asm-powerpc/cputhreads.h        |    2 +-
 include/asm-powerpc/lmb.h               |   82 +-------
 include/asm-powerpc/machdep.h           |    2 +
 include/asm-powerpc/pasemi_dma.h        |   77 +++++++-
 include/asm-powerpc/sparsemem.h         |    1 +
 include/asm-sparc64/lmb.h               |   10 +
 include/linux/lmb.h                     |   83 ++++++++
 lib/Kconfig                             |    3 +
 lib/Makefile                            |    2 +
 {arch/powerpc/mm => lib}/lmb.c          |  141 ++++++++------
 48 files changed, 966 insertions(+), 280 deletions(-)
 create mode 100644 drivers/net/pasemi_mac_ethtool.c
 create mode 100644 include/asm-sparc64/lmb.h
 create mode 100644 include/linux/lmb.h
 rename {arch/powerpc/mm => lib}/lmb.c (68%)
##
# git /pub/scm/linux/kernel/git/airlied/agp-2.6.git	master		drm
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/mchehab/v4l-dvb.git	devel		dvb
##
Merge made by recursive.
 Documentation/video4linux/CARDLIST.bttv            |    2 +
 Documentation/video4linux/CARDLIST.cx88            |    8 +
 Documentation/video4linux/CARDLIST.saa7134         |    7 +
 arch/arm/mach-pxa/devices.c                        |   32 +
 arch/arm/mach-pxa/pcm990-baseboard.c               |   86 +
 drivers/media/Kconfig                              |    7 +-
 drivers/media/common/ir-functions.c                |    2 +-
 drivers/media/common/ir-keymaps.c                  |   53 +-
 drivers/media/common/saa7146_core.c                |    8 +-
 drivers/media/common/saa7146_fops.c                |    2 +-
 drivers/media/common/saa7146_vbi.c                 |    4 +-
 drivers/media/common/saa7146_video.c               |    4 +-
 drivers/media/dvb/b2c2/flexcop-pci.c               |    2 +-
 drivers/media/dvb/bt8xx/dvb-bt8xx.c                |    4 +-
 drivers/media/dvb/dvb-core/demux.h                 |    2 +
 drivers/media/dvb/dvb-core/dmxdev.c                |   10 +-
 drivers/media/dvb/dvb-core/dvb_demux.c             |    2 +-
 drivers/media/dvb/dvb-core/dvb_net.c               |    2 +-
 drivers/media/dvb/dvb-core/dvbdev.c                |    2 +-
 drivers/media/dvb/dvb-usb/cxusb.c                  |    1 -
 drivers/media/dvb/frontends/Kconfig                |    7 +
 drivers/media/dvb/frontends/Makefile               |    1 +
 drivers/media/dvb/frontends/cx22702.c              |    2 +-
 drivers/media/dvb/frontends/dvb-pll.c              |    2 +-
 drivers/media/dvb/frontends/isl6405.c              |  164 ++
 drivers/media/dvb/frontends/isl6405.h              |   74 +
 drivers/media/dvb/frontends/lgdt330x.c             |    2 +-
 drivers/media/dvb/frontends/nxt6000.c              |    2 +-
 drivers/media/dvb/frontends/s5h1409.c              |    2 +-
 drivers/media/dvb/frontends/s5h1420.c              |    2 +-
 drivers/media/dvb/frontends/sp8870.c               |   12 +-
 drivers/media/dvb/frontends/tda1004x.h             |    1 -
 drivers/media/dvb/frontends/tda10086.c             |    2 +-
 drivers/media/dvb/frontends/tda18271-common.c      |   26 +-
 drivers/media/dvb/frontends/tda18271-fe.c          |  309 ++---
 drivers/media/dvb/frontends/tda18271-priv.h        |    8 +-
 drivers/media/dvb/frontends/tda18271-tables.c      |   84 +-
 drivers/media/dvb/frontends/tda18271.h             |   11 +-
 drivers/media/dvb/frontends/tda826x.c              |    2 +-
 drivers/media/dvb/frontends/tda827x.c              |  167 +-
 drivers/media/dvb/frontends/tda827x.h              |    4 +-
 drivers/media/dvb/frontends/ves1x93.c              |    2 +-
 drivers/media/dvb/frontends/xc5000.c               |    2 +-
 drivers/media/dvb/frontends/zl10353.c              |    2 +-
 drivers/media/dvb/ttpci/budget-ci.c                |    2 +-
 drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c  |    4 +-
 drivers/media/radio/miropcm20-rds.c                |    2 +-
 drivers/media/radio/radio-cadet.c                  |   10 +-
 drivers/media/radio/radio-sf16fmr2.c               |  102 +-
 drivers/media/radio/radio-typhoon.c                |    2 +-
 drivers/media/video/Kconfig                        |   45 +
 drivers/media/video/Makefile                       |    8 +-
 drivers/media/video/adv7170.c                      |    2 +-
 drivers/media/video/adv7175.c                      |    2 +-
 drivers/media/video/arv.c                          |    4 +-
 drivers/media/video/bt819.c                        |    2 +-
 drivers/media/video/bt856.c                        |    2 +-
 drivers/media/video/bt8xx/bttv-cards.c             |   55 +-
 drivers/media/video/bt8xx/bttv-driver.c            |   43 +-
 drivers/media/video/bt8xx/bttv-input.c             |    6 +
 drivers/media/video/bt8xx/bttv-vbi.c               |    2 +-
 drivers/media/video/bt8xx/bttv.h                   |    2 +
 drivers/media/video/bw-qcam.c                      |    4 +-
 drivers/media/video/c-qcam.c                       |    4 +-
 drivers/media/video/cafe_ccic.c                    |    4 +-
 drivers/media/video/cpia2/cpia2_core.c             |    4 +-
 drivers/media/video/cpia2/cpia2_usb.c              |    2 +-
 drivers/media/video/cx23885/cx23885-core.c         |    2 +-
 drivers/media/video/cx23885/cx23885-dvb.c          |    7 +-
 drivers/media/video/cx23885/cx23885-i2c.c          |    2 +-
 drivers/media/video/cx23885/cx23885-video.c        |    4 +-
 drivers/media/video/cx25840/cx25840-core.c         |   91 +-
 drivers/media/video/cx25840/cx25840-core.h         |    2 +-
 drivers/media/video/cx25840/cx25840-firmware.c     |   11 +-
 drivers/media/video/cx25840/cx25840-vbi.c          |    6 +-
 drivers/media/video/cx88/cx88-alsa.c               |    8 +-
 drivers/media/video/cx88/cx88-blackbird.c          |    6 +-
 drivers/media/video/cx88/cx88-cards.c              |  529 ++++++-
 drivers/media/video/cx88/cx88-core.c               |    8 +-
 drivers/media/video/cx88/cx88-dvb.c                |  163 ++-
 drivers/media/video/cx88/cx88-i2c.c                |    4 +-
 drivers/media/video/cx88/cx88-input.c              |    9 +-
 drivers/media/video/cx88/cx88-mpeg.c               |    4 +-
 drivers/media/video/cx88/cx88-tvaudio.c            |    6 +-
 drivers/media/video/cx88/cx88-vbi.c                |    2 +-
 drivers/media/video/cx88/cx88-video.c              |   17 +-
 drivers/media/video/cx88/cx88.h                    |    8 +
 drivers/media/video/dabfirmware.h                  |    7 +
 drivers/media/video/dabusb.c                       |    8 +-
 drivers/media/video/dpc7146.c                      |    4 +-
 drivers/media/video/em28xx/em28xx-cards.c          |    2 +-
 drivers/media/video/em28xx/em28xx-core.c           |   24 +-
 drivers/media/video/em28xx/em28xx-i2c.c            |    4 +-
 drivers/media/video/em28xx/em28xx-video.c          |    2 +-
 drivers/media/video/et61x251/et61x251_core.c       |    2 +-
 drivers/media/video/hexium_gemini.c                |    4 +-
 drivers/media/video/hexium_orion.c                 |    4 +-
 drivers/media/video/ir-kbd-i2c.c                   |   26 +-
 drivers/media/video/ivtv/ivtv-cards.c              |    7 +-
 drivers/media/video/ivtv/ivtv-cards.h              |    2 +-
 drivers/media/video/ivtv/ivtv-driver.c             |   44 +-
 drivers/media/video/ivtv/ivtv-driver.h             |    2 +
 drivers/media/video/ivtv/ivtv-fileops.c            |    2 +-
 drivers/media/video/ivtv/ivtv-ioctl.c              |   36 +-
 drivers/media/video/ivtv/ivtv-irq.c                |   25 +-
 drivers/media/video/ivtv/ivtv-queue.c              |    4 +-
 drivers/media/video/ivtv/ivtv-yuv.c                |   38 +-
 drivers/media/video/meye.c                         |   12 +-
 drivers/media/video/msp3400-kthreads.c             |   15 +-
 drivers/media/video/mt20xx.c                       |    9 +-
 drivers/media/video/mt9m001.c                      |  722 ++++++++
 drivers/media/video/mt9v022.c                      |  846 ++++++++++
 drivers/media/video/mxb.c                          |    4 +-
 drivers/media/video/pms.c                          |    4 +-
 drivers/media/video/pvrusb2/pvrusb2-context.c      |  116 +-
 drivers/media/video/pvrusb2/pvrusb2-context.h      |    8 +-
 drivers/media/video/pvrusb2/pvrusb2-ctrl.c         |   19 +-
 drivers/media/video/pvrusb2/pvrusb2-debug.h        |    2 +-
 drivers/media/video/pvrusb2/pvrusb2-devattr.c      |   52 +-
 drivers/media/video/pvrusb2/pvrusb2-devattr.h      |   57 +-
 drivers/media/video/pvrusb2/pvrusb2-encoder.c      |   10 -
 drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h      |    9 +
 drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h |   20 +-
 drivers/media/video/pvrusb2/pvrusb2-hdw.c          |  394 ++++-
 drivers/media/video/pvrusb2/pvrusb2-hdw.h          |   23 +-
 drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    2 +-
 drivers/media/video/pvrusb2/pvrusb2-std.c          |    9 +-
 drivers/media/video/pvrusb2/pvrusb2-sysfs.c        |    4 +
 drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |  186 ++-
 drivers/media/video/pwc/pwc-if.c                   |    8 +-
 drivers/media/video/pxa_camera.c                   |  985 +++++++++++
 drivers/media/video/saa6588.c                      |    8 +-
 drivers/media/video/saa7110.c                      |    2 +-
 drivers/media/video/saa7111.c                      |    2 +-
 drivers/media/video/saa7114.c                      |    2 +-
 drivers/media/video/saa7115.c                      |    4 +-
 drivers/media/video/saa711x.c                      |    2 +-
 drivers/media/video/saa7134/saa7134-alsa.c         |   12 +-
 drivers/media/video/saa7134/saa7134-cards.c        |  347 ++++-
 drivers/media/video/saa7134/saa7134-core.c         |   52 +-
 drivers/media/video/saa7134/saa7134-dvb.c          |  346 +++--
 drivers/media/video/saa7134/saa7134-empress.c      |    6 +-
 drivers/media/video/saa7134/saa7134-i2c.c          |    4 +-
 drivers/media/video/saa7134/saa7134-input.c        |    6 +-
 drivers/media/video/saa7134/saa7134-reg.h          |    3 +
 drivers/media/video/saa7134/saa7134-ts.c           |    2 +-
 drivers/media/video/saa7134/saa7134-tvaudio.c      |   21 +-
 drivers/media/video/saa7134/saa7134-vbi.c          |    2 +-
 drivers/media/video/saa7134/saa7134-video.c        |   17 +-
 drivers/media/video/saa7134/saa7134.h              |   16 +-
 drivers/media/video/saa7185.c                      |    2 +-
 drivers/media/video/se401.c                        |    4 +-
 drivers/media/video/sn9c102/sn9c102_core.c         |    4 +-
 drivers/media/video/sn9c102/sn9c102_sensor.h       |    2 +-
 drivers/media/video/soc_camera.c                   |  998 +++++++++++
 drivers/media/video/stk-webcam.c                   |    4 +-
 drivers/media/video/stradis.c                      |    4 +-
 drivers/media/video/stv680.c                       |    9 +-
 drivers/media/video/tda8290.c                      |   12 +-
 drivers/media/video/tda8290.h                      |    2 +-
 drivers/media/video/tda9840.c                      |    2 +-
 drivers/media/video/tda9887.c                      |   42 +-
 drivers/media/video/tea5761.c                      |    7 +-
 drivers/media/video/tea5767.c                      |   34 +-
 drivers/media/video/tea6415c.c                     |    2 +-
 drivers/media/video/tea6420.c                      |    2 +-
 drivers/media/video/tuner-core.c                   |   47 +-
 drivers/media/video/tuner-i2c.h                    |  118 ++-
 drivers/media/video/tuner-simple.c                 |  824 +++++++---
 drivers/media/video/tuner-simple.h                 |   11 +-
 drivers/media/video/tuner-types.c                  |  188 ++-
 drivers/media/video/tuner-xc2028.c                 |   33 +-
 drivers/media/video/tvaudio.c                      |    8 +-
 drivers/media/video/tveeprom.c                     |  103 --
 drivers/media/video/tvp5150.c                      |    2 +-
 drivers/media/video/usbvideo/ibmcam.c              |    2 +-
 drivers/media/video/usbvideo/konicawc.c            |    2 +-
 drivers/media/video/usbvideo/quickcam_messenger.c  |    2 +-
 drivers/media/video/usbvideo/ultracam.c            |    4 +-
 drivers/media/video/usbvideo/usbvideo.c            |    6 +-
 drivers/media/video/usbvision/usbvision-core.c     |   14 +-
 drivers/media/video/usbvision/usbvision-i2c.c      |    2 +-
 drivers/media/video/usbvision/usbvision-video.c    |    4 +-
 drivers/media/video/v4l1-compat.c                  | 1737 +++++++++++---------
 drivers/media/video/videobuf-core.c                |    7 +-
 drivers/media/video/videobuf-dma-sg.c              |  121 +-
 drivers/media/video/videobuf-dvb.c                 |    2 +-
 drivers/media/video/videobuf-vmalloc.c             |    4 +-
 drivers/media/video/videocodec.c                   |    4 +-
 drivers/media/video/vino.c                         |   10 +-
 drivers/media/video/vpx3220.c                      |    2 +-
 drivers/media/video/w9966.c                        |    4 +-
 drivers/media/video/w9968cf.c                      |    2 +-
 drivers/media/video/zc0301/zc0301_core.c           |    2 +-
 drivers/media/video/zoran_card.c                   |    6 +-
 drivers/media/video/zoran_device.c                 |    5 +-
 drivers/media/video/zoran_driver.c                 |    2 +-
 drivers/media/video/zr36016.c                      |    5 +-
 drivers/media/video/zr36050.c                      |    5 +-
 drivers/media/video/zr36060.c                      |    6 +-
 drivers/media/video/zr364xx.c                      |    4 +-
 include/asm-arm/arch-pxa/camera.h                  |   48 +
 include/asm-arm/arch-pxa/pxa-regs.h                |  147 ++-
 include/linux/dvb/dmx.h                            |    3 +-
 include/linux/meye.h                               |    2 +-
 include/linux/videodev2.h                          |   52 +-
 include/media/ir-common.h                          |    1 +
 include/media/soc_camera.h                         |  173 ++
 include/media/tuner-types.h                        |   17 +-
 include/media/tuner.h                              |    2 +-
 include/media/v4l2-chip-ident.h                    |    6 +
 include/media/videobuf-core.h                      |    4 +-
 include/media/videobuf-dma-sg.h                    |   14 +-
 213 files changed, 9274 insertions(+), 2572 deletions(-)
 create mode 100644 drivers/media/dvb/frontends/isl6405.c
 create mode 100644 drivers/media/dvb/frontends/isl6405.h
 create mode 100644 drivers/media/video/mt9m001.c
 create mode 100644 drivers/media/video/mt9v022.c
 create mode 100644 drivers/media/video/pxa_camera.c
 create mode 100644 drivers/media/video/soc_camera.c
 create mode 100644 include/asm-arm/arch-pxa/camera.h
 create mode 100644 include/media/soc_camera.h
##
# quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/		i2c
##
2.6.25-rc6-git1 to bde4f8fa8db2abd5ac9c542d76012d0fedab050f
Using base bde4f8fa8db2abd5ac9c542d76012d0fedab050f
i2c-bfin-twi-disable-BF54x.patch
i2c-omap-i2c-clock-race.patch
sound-tlv320aic3x-fix-driverid-abuse.patch
i2c-fix-docbook-problem.patch
i2c-no-algos-in-kconfig.patch
i2c-pca-01-removing-trailing-whitespace.patch
i2c-pca-02-extension-of-pca-algorithm.patch
i2c-pca-03-platform-driver.patch
i2c-ibm_iic-01-change-log-levels.patch
i2c-ibm_iic-02-of-platform.patch
i2c-dev-split-i2cdev_ioctl.patch
i2c-bus-driver-for-sh7760-soc.patch
i2c-replace-remaining-__FUNCTION__-occurrences.patch
i2c-remove-whitespaces-in-busses-Kconfig.patch
i2c-isp1301_omap-convert-to-new-style-1.patch
##
# merge i2c
##
Removed drivers/i2c/algos/i2c-algo-pca.h
Merge made by recursive.
 drivers/i2c/algos/Kconfig             |   39 +--
 drivers/i2c/algos/i2c-algo-pca.c      |  126 ++++----
 drivers/i2c/algos/i2c-algo-pca.h      |   26 --
 drivers/i2c/busses/Kconfig            |   58 +++--
 drivers/i2c/busses/Makefile           |    2 +
 drivers/i2c/busses/i2c-davinci.c      |    6 +-
 drivers/i2c/busses/i2c-ibm_iic.c      |  197 +++++++++++-
 drivers/i2c/busses/i2c-omap.c         |   36 ++-
 drivers/i2c/busses/i2c-pca-isa.c      |   53 ++--
 drivers/i2c/busses/i2c-pca-platform.c |  298 +++++++++++++++++
 drivers/i2c/busses/i2c-pmcmsp.c       |    4 +-
 drivers/i2c/busses/i2c-pnx.c          |   44 ++--
 drivers/i2c/busses/i2c-pxa.c          |    2 +-
 drivers/i2c/busses/i2c-s3c2410.c      |    4 +-
 drivers/i2c/busses/i2c-sh7760.c       |  577 +++++++++++++++++++++++++++++++++
 drivers/i2c/chips/isp1301_omap.c      |   87 +++---
 drivers/i2c/i2c-core.c                |    6 +-
 drivers/i2c/i2c-dev.c                 |  329 ++++++++++---------
 include/asm-sh/i2c-sh7760.h           |   22 ++
 include/linux/i2c-algo-pca.h          |   37 ++-
 include/linux/i2c-pca-platform.h      |   12 +
 sound/soc/codecs/tlv320aic3x.c        |    2 -
 22 files changed, 1534 insertions(+), 433 deletions(-)
 delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h
 create mode 100644 drivers/i2c/busses/i2c-pca-platform.c
 create mode 100644 drivers/i2c/busses/i2c-sh7760.c
 create mode 100644 include/asm-sh/i2c-sh7760.h
 create mode 100644 include/linux/i2c-pca-platform.h
##
# git /pub/scm/linux/kernel/git/jikos/hid.git		upstream	hid-upstream
##
Auto-merged drivers/hid/usbhid/hid-core.c
Auto-merged drivers/hid/usbhid/hid-quirks.c
Merge made by recursive.
 drivers/hid/hid-input-quirks.c  |   22 +++-
 drivers/hid/usbhid/hid-core.c   |   40 ++++---
 drivers/hid/usbhid/hid-quirks.c |   54 ++++++++
 drivers/hid/usbhid/hiddev.c     |  286 ++++++++++++++++++++-------------------
 include/linux/hid.h             |    5 +-
 5 files changed, 253 insertions(+), 154 deletions(-)
##
# git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git	master		hrt
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/dtor/input.git		for-linus	input
##
Merge made by recursive.
 drivers/input/keyboard/pxa27x_keypad.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
##
# git /pub/scm/linux/kernel/git/dtor/input.git		master		input-devel
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/shaggy/jfs-2.6.git	for-linus	jfs
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/sam/kbuild.git		master		kbuild
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/avi/kvm.git		master		kvm
##
Auto-merged arch/x86/kernel/reboot.c
Auto-merged arch/x86/kernel/setup_64.c
Removed arch/x86/kvm/segment_descriptor.h
Merge made by recursive.
 arch/x86/Kconfig                  |   18 ++
 arch/x86/kernel/Makefile          |    2 +
 arch/x86/kernel/crash.c           |    3 +-
 arch/x86/kernel/kvm.c             |  247 +++++++++++++++
 arch/x86/kernel/kvmclock.c        |  187 ++++++++++++
 arch/x86/kernel/reboot.c          |   13 +-
 arch/x86/kernel/setup_32.c        |    6 +
 arch/x86/kernel/setup_64.c        |    7 +
 arch/x86/kvm/Makefile             |    3 +-
 arch/x86/kvm/i8254.c              |  600 +++++++++++++++++++++++++++++++++++++
 arch/x86/kvm/i8254.h              |   62 ++++
 arch/x86/kvm/irq.c                |    3 +
 arch/x86/kvm/kvm_svm.h            |    2 +
 arch/x86/kvm/lapic.c              |    8 +-
 arch/x86/kvm/mmu.c                |  563 ++++++++++++++++++++++++++++++-----
 arch/x86/kvm/mmu.h                |    6 +
 arch/x86/kvm/paging_tmpl.h        |   70 +++--
 arch/x86/kvm/segment_descriptor.h |   29 --
 arch/x86/kvm/svm.c                |  229 +++++++++++----
 arch/x86/kvm/vmx.c                |  139 +++++++---
 arch/x86/kvm/vmx.h                |   10 +-
 arch/x86/kvm/x86.c                |  386 +++++++++++++++++++-----
 arch/x86/kvm/x86_emulate.c        |  256 +++++++++-------
 include/asm-x86/kvm.h             |   21 ++
 include/asm-x86/kvm_host.h        |   60 ++++-
 include/asm-x86/kvm_para.h        |   55 ++++
 include/asm-x86/reboot.h          |    2 +
 include/linux/kvm.h               |   10 +
 include/linux/kvm_host.h          |   23 +-
 include/linux/kvm_para.h          |   11 +-
 virt/kvm/kvm_main.c               |   91 +++++-
 31 files changed, 2664 insertions(+), 458 deletions(-)
 create mode 100644 arch/x86/kernel/kvm.c
 create mode 100644 arch/x86/kernel/kvmclock.c
 create mode 100644 arch/x86/kvm/i8254.c
 create mode 100644 arch/x86/kvm/i8254.h
 delete mode 100644 arch/x86/kvm/segment_descriptor.h
##
# git git://git.o-hand.com/linux-rpurdie-leds		for-linus	leds
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/axboe/linux-2.6-block	for-linus	block-for-linus
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes	libata-upstream-fixes
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream	libata-upstream
##
BRANCH upstream not in tree /pub/scm/linux/kernel/git/jgarzik/libata-dev.git, SKIPPING
##
# git /pub/scm/linux/kernel/git/roland/infiniband.git	for-linus	infiniband-for-linus
##
Merge made by recursive.
 drivers/infiniband/hw/nes/nes_cm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
##
# gitfetch /pub/scm/linux/kernel/git/roland/infiniband.git	for-2.6.26	infiniband
##
##
# revert a1dcf69bd2f16de76f530c80c11d1356b13f5423 infiniband
##
Auto-merged drivers/infiniband/hw/amso1100/c2_qp.c
Auto-merged drivers/infiniband/hw/amso1100/c2_rnic.c
Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c
Auto-merged drivers/infiniband/hw/nes/nes.c
Auto-merged drivers/infiniband/hw/nes/nes.h
Auto-merged drivers/infiniband/hw/nes/nes_cm.c
Auto-merged drivers/infiniband/hw/nes/nes_hw.c
Auto-merged drivers/infiniband/hw/nes/nes_nic.c
Auto-merged drivers/infiniband/hw/nes/nes_verbs.c
Created commit 741dd88b: Revert "IB: Replace remaining __FUNCTION__ occurrences with __func__"
 26 files changed, 302 insertions(+), 302 deletions(-)
##
# merge infiniband resolve /home/jejb/infiniband-fixup.diff
##
Auto-merged drivers/infiniband/core/uverbs.h
Auto-merged drivers/infiniband/core/uverbs_main.c
Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c
Auto-merged drivers/infiniband/hw/ipath/ipath_diag.c
Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c
Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h
Auto-merged drivers/infiniband/hw/ipath/ipath_verbs.c
Auto-merged drivers/infiniband/hw/mlx4/main.c
Auto-merged drivers/infiniband/hw/mthca/mthca_provider.c
Auto-merged drivers/infiniband/hw/nes/nes_cm.c
Auto-merged drivers/infiniband/hw/nes/nes_verbs.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c
Auto-merged drivers/infiniband/ulp/srp/ib_srp.c
Auto-merged include/rdma/ib_verbs.h
Created commit 5e95c4b: Resolve Patch: /home/jejb/infiniband-fixup.diff
##
# git /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git	release		acpi
##
Already up-to-date.
##
# git /home/rmk/linux-2.6-arm.git	for-linus	arm-for-linus
##
Already up-to-date.
##
# git /home/rmk/linux-2.6-arm.git	master		arm
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus	ieee1394-for-linus
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git master		ieee1394
##
Merge made by recursive.
 Documentation/debugging-via-ohci1394.txt |   13 +-
 drivers/firewire/fw-card.c               |   40 +-----
 drivers/firewire/fw-cdev.c               |   13 +-
 drivers/firewire/fw-device.c             |  263 ++++++++++++++++++++++++------
 drivers/firewire/fw-device.h             |   38 +++-
 drivers/firewire/fw-ohci.c               |  114 +++++++-------
 drivers/firewire/fw-sbp2.c               |  150 ++++++++---------
 drivers/firewire/fw-topology.c           |    3 +
 drivers/firewire/fw-topology.h           |   11 +-
 drivers/firewire/fw-transaction.c        |   11 +-
 drivers/firewire/fw-transaction.h        |    6 -
 drivers/ieee1394/csr.c                   |    6 +-
 drivers/ieee1394/dv1394.c                |    3 +-
 drivers/ieee1394/highlevel.c             |    6 +-
 drivers/ieee1394/ieee1394_core.c         |    2 +-
 drivers/ieee1394/nodemgr.c               |    6 +-
 drivers/ieee1394/ohci1394.c              |  111 ++++++-------
 drivers/ieee1394/pcilynx.c               |   12 +-
 drivers/ieee1394/raw1394.c               |    1 -
 drivers/ieee1394/sbp2.c                  |   11 +-
 drivers/ieee1394/video1394.c             |    3 +-
 lib/Kconfig.debug                        |   10 +
 22 files changed, 487 insertions(+), 346 deletions(-)
##
# git git://lost.foo-projects.org/~dwillia2/git/iop	md-fixes-for-linus	iop-fixes
##
Already up-to-date.
##
# git git://lost.foo-projects.org/~dwillia2/git/iop	md-for-linus	iop
##
Auto-merged crypto/async_tx/async_tx.c
Auto-merged crypto/async_tx/async_xor.c
Auto-merged drivers/dma/dmaengine.c
Auto-merged drivers/dma/fsldma.c
Auto-merged drivers/dma/iop-adma.c
Merge made by recursive.
 crypto/async_tx/async_tx.c             |  197 ++++++++++++++++++++++++++------
 drivers/dma/dmaengine.c                |    3 -
 drivers/dma/fsldma.c                   |    8 --
 drivers/dma/ioat_dma.c                 |   12 --
 drivers/dma/iop-adma.c                 |   21 +---
 include/asm-arm/arch-iop13xx/adma.h    |    5 -
 include/asm-arm/hardware/iop3xx-adma.h |    8 --
 include/asm-arm/hardware/iop_adma.h    |    2 -
 include/linux/dmaengine.h              |   11 +--
 9 files changed, 170 insertions(+), 97 deletions(-)
##
# git git://www.linux-mips.org/pub/scm/upstream-linus.git	upstream	mips
##
Already up-to-date.
##
# git git://www.linux-mips.org/pub/scm/upstream.git	master		mips-devel
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/drzeus/mmc.git		for-linus	mmc
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/drzeus/mmc.git		for-andrew	mmc-devel
##
Already up-to-date.
##
# git git://git.infradead.org/mtd-2.6.git			master		mtd
##
Merge made by recursive.
 drivers/mtd/onenand/onenand_base.c |   32 +++++++++++++++++---------------
 fs/jffs2/fs.c                      |   14 +++++++++++---
 2 files changed, 28 insertions(+), 18 deletions(-)
##
# gitfetch /pub/scm/linux/kernel/git/davem/net-2.6.26.git	master		net
##
##
# merge net resolve /home/jejb/net-fixup.diff
##
Removed Documentation/networking/bcm43xx.txt
Auto-merged MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Removed drivers/net/wireless/bcm43xx/Kconfig
Removed drivers/net/wireless/bcm43xx/Makefile
Removed drivers/net/wireless/bcm43xx/bcm43xx.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_main.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_main.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_power.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_power.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.h
Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
Removed drivers/net/wireless/rt2x00/rt2x00ring.h
Removed include/net/ieee80211softmac.h
Removed include/net/ieee80211softmac_wx.h
Auto-merged net/core/sock.c
Removed net/ieee80211/softmac/Kconfig
Removed net/ieee80211/softmac/Makefile
Removed net/ieee80211/softmac/ieee80211softmac_assoc.c
Removed net/ieee80211/softmac/ieee80211softmac_auth.c
Removed net/ieee80211/softmac/ieee80211softmac_event.c
Removed net/ieee80211/softmac/ieee80211softmac_io.c
Removed net/ieee80211/softmac/ieee80211softmac_module.c
Removed net/ieee80211/softmac/ieee80211softmac_priv.h
Removed net/ieee80211/softmac/ieee80211softmac_scan.c
Removed net/ieee80211/softmac/ieee80211softmac_wx.c
Removed net/mac80211/rc80211_simple.c
Removed net/mac80211/regdomain.c
Created commit 28714f2: Resolve Patch: /home/jejb/net-fixup.diff
##
# git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git	linux-next	nfs
##
Auto-merged fs/nfs/super.c
Auto-merged net/sunrpc/auth_gss/auth_gss.c
Auto-merged net/sunrpc/clnt.c
Auto-merged net/sunrpc/rpcb_clnt.c
Auto-merged net/sunrpc/xprtsock.c
Merge made by recursive.
 fs/Kconfig                     |   70 +++++------
 fs/lockd/host.c                |   20 ++--
 fs/lockd/mon.c                 |  113 +++++++++++++----
 fs/lockd/svc.c                 |   12 ++
 fs/nfs/Makefile                |    3 +-
 fs/nfs/client.c                |   16 +++
 fs/nfs/dir.c                   |    2 +-
 fs/nfs/direct.c                |    9 +-
 fs/nfs/file.c                  |    6 -
 fs/nfs/inode.c                 |   45 +++++++-
 fs/nfs/internal.h              |   13 +--
 fs/nfs/nfs2xdr.c               |   37 +++++--
 fs/nfs/nfs3xdr.c               |   37 +++++--
 fs/nfs/nfs4proc.c              |   18 ++-
 fs/nfs/nfs4state.c             |    8 +-
 fs/nfs/nfs4xdr.c               |   39 +++++--
 fs/nfs/read.c                  |   18 +--
 fs/nfs/super.c                 |  130 +++++++++++++-------
 fs/nfs/unlink.c                |    2 +-
 fs/nfs/write.c                 |   86 +++++++------
 include/linux/lockd/lockd.h    |   17 ++--
 include/linux/lockd/sm_inter.h |    1 +
 include/linux/nfs_fs_sb.h      |    8 ++
 include/linux/sunrpc/auth.h    |   13 ++-
 include/linux/sunrpc/clnt.h    |    9 +-
 include/linux/sunrpc/sched.h   |   41 +++----
 net/sunrpc/Makefile            |    2 +-
 net/sunrpc/auth.c              |   63 ++++++----
 net/sunrpc/auth_generic.c      |  157 ++++++++++++++++++++++++
 net/sunrpc/auth_gss/auth_gss.c |    7 +-
 net/sunrpc/auth_null.c         |    1 +
 net/sunrpc/auth_unix.c         |   57 ++++-----
 net/sunrpc/clnt.c              |    8 +-
 net/sunrpc/rpcb_clnt.c         |    2 +-
 net/sunrpc/sched.c             |  264 ++++++++++++++++++----------------------
 net/sunrpc/xprt.c              |   45 ++++---
 net/sunrpc/xprtsock.c          |    7 +-
 37 files changed, 888 insertions(+), 498 deletions(-)
 create mode 100644 net/sunrpc/auth_generic.c
##
# git git://git.linux-nfs.org/~bfields/linux.git		for-linus	nfsd-for-linus
##
Already up-to-date.
##
# git git://git.linux-nfs.org/~bfields/linux.git		for-2.6.26	nfsd
##
Auto-merged fs/nfsd/export.c
Auto-merged fs/nfsd/nfsctl.c
Auto-merged include/net/ipv6.h
Auto-merged net/sunrpc/auth_gss/auth_gss.c
Auto-merged net/sunrpc/svcauth_unix.c
Merge made by recursive.
 fs/nfs/symlink.c               |    1 -
 fs/nfsd/export.c               |    9 ++-
 fs/nfsd/nfsctl.c               |   15 +++++-
 include/linux/nfs3.h           |    2 +-
 include/linux/sunrpc/svcauth.h |    4 +-
 include/net/ipv6.h             |    9 +++
 net/sunrpc/auth_gss/auth_gss.c |   39 ++++++++-----
 net/sunrpc/svcauth_unix.c      |  118 +++++++++++++++++++++++++++-------------
 8 files changed, 135 insertions(+), 62 deletions(-)
##
# git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git	for-linus	s390-linus
##
Already up-to-date.
##
# git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git	features	s390
##
Auto-merged fs/Kconfig
Auto-merged kernel/sched.c
Merge made by recursive.
 arch/s390/Kconfig                   |    4 +
 arch/s390/defconfig                 |    4 +-
 arch/s390/kernel/Makefile           |    2 +-
 arch/s390/kernel/compat_signal.c    |   10 +
 arch/s390/kernel/early.c            |   14 ++
 arch/s390/kernel/head64.S           |   12 ++-
 arch/s390/kernel/setup.c            |   32 ++--
 arch/s390/kernel/signal.c           |   10 +
 arch/s390/kernel/smp.c              |   87 +++++++++-
 arch/s390/kernel/time.c             |    2 +-
 arch/s390/kernel/topology.c         |  316 +++++++++++++++++++++++++++++++++++
 arch/s390/mm/Makefile               |    2 +-
 arch/s390/mm/fault.c                |    3 +
 arch/s390/mm/hugetlbpage.c          |  134 +++++++++++++++
 arch/s390/mm/init.c                 |   23 ---
 arch/s390/mm/vmem.c                 |   55 ++++++-
 drivers/base/topology.c             |   17 +-
 drivers/char/hw_random/core.c       |    4 +
 drivers/crypto/Kconfig              |    1 +
 drivers/s390/block/Kconfig          |    1 +
 drivers/s390/block/dasd.c           |    1 +
 drivers/s390/block/dasd_3990_erp.c  |   34 ++++
 drivers/s390/block/dasd_eckd.c      |    7 +
 drivers/s390/block/dasd_int.h       |    6 +
 drivers/s390/cio/chsc.c             |   12 +-
 drivers/s390/cio/css.c              |    5 +
 drivers/s390/cio/css.h              |    1 +
 drivers/s390/crypto/zcrypt_api.c    |  120 +++++++++++++
 drivers/s390/crypto/zcrypt_api.h    |    8 +
 drivers/s390/crypto/zcrypt_pcixcc.c |  199 ++++++++++++++++++++++-
 drivers/s390/sysinfo.c              |  116 ++-----------
 fs/Kconfig                          |    3 +-
 include/asm-s390/page.h             |   29 +++-
 include/asm-s390/pgtable.h          |  158 +++++++++++++++++
 include/asm-s390/setup.h            |    4 +
 include/asm-s390/smp.h              |    3 +
 include/asm-s390/sysinfo.h          |  117 +++++++++++++
 include/asm-s390/system.h           |   12 ++
 include/asm-s390/timex.h            |   12 +-
 include/asm-s390/tlbflush.h         |   34 +++--
 include/asm-s390/topology.h         |   25 +++
 include/linux/hugetlb.h             |   22 +++
 mm/hugetlb.c                        |   37 +++--
 43 files changed, 1494 insertions(+), 204 deletions(-)
 create mode 100644 arch/s390/kernel/topology.c
 create mode 100644 arch/s390/mm/hugetlbpage.c
 create mode 100644 include/asm-s390/sysinfo.h
##
# git git://git.o-hand.com/linux-rpurdie-backlight	for-linus	backlight
##
Already up-to-date.
##
# git git://git.infradead.org/battery-2.6			master		battery
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/mfasheh/ocfs2.git		ALL	ocfs2
##
Auto-merged Documentation/feature-removal-schedule.txt
Auto-merged fs/Kconfig
Merge made by recursive.
 Documentation/ABI/obsolete/o2cb            |   11 +
 Documentation/ABI/stable/o2cb              |   10 +
 Documentation/feature-removal-schedule.txt |   11 +
 fs/Kconfig                                 |   26 +
 fs/ocfs2/Makefile                          |   14 +-
 fs/ocfs2/alloc.c                           |  465 +++++++++++++--
 fs/ocfs2/cluster/sys.c                     |    9 +
 fs/ocfs2/cluster/tcp.c                     |   51 ++-
 fs/ocfs2/cluster/tcp_internal.h            |    2 +
 fs/ocfs2/dlm/dlmcommon.h                   |   49 ++
 fs/ocfs2/dlm/dlmdebug.c                    |  911 +++++++++++++++++++++++++---
 fs/ocfs2/dlm/dlmdebug.h                    |   86 +++
 fs/ocfs2/dlm/dlmdomain.c                   |   70 ++-
 fs/ocfs2/dlm/dlmlock.c                     |   22 +-
 fs/ocfs2/dlm/dlmmaster.c                   |  200 ++-----
 fs/ocfs2/dlmglue.c                         |  645 ++++++++++++--------
 fs/ocfs2/dlmglue.h                         |    5 +-
 fs/ocfs2/file.c                            |    4 +-
 fs/ocfs2/heartbeat.c                       |  184 +------
 fs/ocfs2/heartbeat.h                       |   17 +-
 fs/ocfs2/ioctl.c                           |   13 +-
 fs/ocfs2/ioctl.h                           |    3 +-
 fs/ocfs2/journal.c                         |  211 ++++++-
 fs/ocfs2/journal.h                         |    4 +
 fs/ocfs2/localalloc.c                      |    4 +
 fs/ocfs2/namei.c                           |    4 +-
 fs/ocfs2/ocfs2.h                           |   77 ++-
 fs/ocfs2/ocfs2_fs.h                        |   79 +++-
 fs/ocfs2/ocfs2_lockid.h                    |    2 +-
 fs/ocfs2/slot_map.c                        |  454 +++++++++++---
 fs/ocfs2/slot_map.h                        |   32 +-
 fs/ocfs2/stack_o2cb.c                      |  420 +++++++++++++
 fs/ocfs2/stack_user.c                      |  883 +++++++++++++++++++++++++++
 fs/ocfs2/stackglue.c                       |  568 +++++++++++++++++
 fs/ocfs2/stackglue.h                       |  261 ++++++++
 fs/ocfs2/suballoc.c                        |  103 +++-
 fs/ocfs2/suballoc.h                        |    1 +
 fs/ocfs2/super.c                           |  208 ++++---
 fs/sysfs/symlink.c                         |    9 +-
 39 files changed, 5119 insertions(+), 1009 deletions(-)
 create mode 100644 Documentation/ABI/obsolete/o2cb
 create mode 100644 Documentation/ABI/stable/o2cb
 create mode 100644 fs/ocfs2/dlm/dlmdebug.h
 create mode 100644 fs/ocfs2/stack_o2cb.c
 create mode 100644 fs/ocfs2/stack_user.c
 create mode 100644 fs/ocfs2/stackglue.c
 create mode 100644 fs/ocfs2/stackglue.h
##
# git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git	for-linus	selinux-linus
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git	for-akpm		selinux
##
Auto-merged security/commoncap.c
Auto-merged security/security.c
Auto-merged security/selinux/hooks.c
Auto-merged security/selinux/include/security.h
Merge made by recursive.
 security/commoncap.c                         |    4 +-
 security/keys/internal.h                     |    8 +-
 security/root_plug.c                         |    2 +-
 security/security.c                          |    8 +-
 security/selinux/avc.c                       |    4 +-
 security/selinux/hooks.c                     |   64 ++++++++++++++------
 security/selinux/include/av_perm_to_string.h |    5 ++
 security/selinux/include/av_permissions.h    |    5 ++
 security/selinux/include/netlabel.h          |   16 -----
 security/selinux/include/objsec.h            |    8 ---
 security/selinux/include/security.h          |    2 +
 security/selinux/netlabel.c                  |   82 +++++---------------------
 security/selinux/netlink.c                   |    2 +-
 security/selinux/selinuxfs.c                 |   11 ++--
 security/selinux/ss/avtab.c                  |   40 ++++++------
 security/selinux/ss/conditional.c            |   16 +++---
 security/selinux/ss/ebitmap.c                |   14 ++--
 security/selinux/ss/policydb.c               |   54 +++++++++---------
 security/selinux/ss/services.c               |   35 ++++++-----
 19 files changed, 174 insertions(+), 206 deletions(-)
##
# git /pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git	master		sched
##
Already up-to-date.
##
# gitfetch /pub/scm/linux/kernel/git/lethal/sh-2.6.git		master		sh
##
##
# merge sh resolve /home/jejb/sh-fixup.diff
##
Auto-merged arch/sh/Kconfig
CONFLICT (content): Merge conflict in arch/sh/Kconfig
Auto-merged arch/sh/Makefile
Created commit a69341d: Resolve Patch: /home/jejb/sh-fixup.diff
##
# git /pub/scm/linux/kernel/git/ericvh/v9fs		for-linus	v9fs
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/ericvh/v9fs		v9fs-devel	v9fs-devel
##
Auto-merged net/9p/error.c
Merge made by recursive.
 fs/9p/fid.h                |   15 +++
 fs/9p/v9fs.c               |   52 ++++++++--
 fs/9p/v9fs.h               |   85 +++++++++++-----
 fs/9p/vfs_addr.c           |    2 +-
 fs/9p/vfs_dir.c            |    2 +-
 fs/9p/vfs_file.c           |   11 +-
 fs/9p/vfs_inode.c          |   50 +++++++---
 fs/9p/vfs_super.c          |    1 +
 include/linux/parser.h     |    2 +-
 include/net/9p/9p.h        |  239 ++++++++++++++++++++++++++++++++++++++------
 include/net/9p/client.h    |   35 +++++++
 include/net/9p/transport.h |   43 ++++++++
 lib/parser.c               |   32 ++++--
 net/9p/client.c            |   32 +++++--
 net/9p/conv.c              |  128 +++++++++++++++++++++++-
 net/9p/error.c             |   11 ++-
 net/9p/fcprint.c           |    8 ++
 net/9p/mod.c               |    7 +-
 net/9p/trans_fd.c          |  175 +++++++++++++++++++++++++++------
 net/9p/trans_virtio.c      |  173 ++++++++++++++++++++++++++++----
 net/9p/util.c              |   32 +++++-
 21 files changed, 966 insertions(+), 169 deletions(-)
##
# git /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git master		watchdog
##
Already up-to-date.
##
# git git://oss.sgi.com:8090/xfs/xfs-2.6.git		 master		xfs
##
Auto-merged fs/xfs/xfs_iget.c
Merge made by recursive.
 fs/xfs/linux-2.6/xfs_aops.c    |    4 +-
 fs/xfs/linux-2.6/xfs_export.c  |   11 +-
 fs/xfs/linux-2.6/xfs_file.c    |   13 +-
 fs/xfs/linux-2.6/xfs_fs_subr.c |   36 +--
 fs/xfs/linux-2.6/xfs_ioctl.c   |  562 +++++++++++++++-------------------
 fs/xfs/linux-2.6/xfs_iops.c    |  180 ++++++------
 fs/xfs/linux-2.6/xfs_linux.h   |    1 -
 fs/xfs/linux-2.6/xfs_lrw.c     |   53 ++--
 fs/xfs/linux-2.6/xfs_super.c   |    3 +-
 fs/xfs/linux-2.6/xfs_vnode.h   |   19 +-
 fs/xfs/quota/xfs_qm.c          |    6 +-
 fs/xfs/quota/xfs_qm_bhv.c      |    2 +-
 fs/xfs/quota/xfs_qm_syscalls.c |    4 +-
 fs/xfs/support/ktrace.c        |   37 ++--
 fs/xfs/support/ktrace.h        |    3 +-
 fs/xfs/xfs_attr_leaf.c         |    6 +-
 fs/xfs/xfs_bmap.c              |   26 +-
 fs/xfs/xfs_bmap_btree.h        |    2 +-
 fs/xfs/xfs_dir2.c              |    2 +-
 fs/xfs/xfs_fsops.c             |   24 +-
 fs/xfs/xfs_ialloc.c            |    6 +-
 fs/xfs/xfs_iget.c              |   49 +---
 fs/xfs/xfs_inode.c             |  661 ++++++++++++++++++++--------------------
 fs/xfs/xfs_inode.h             |   23 +--
 fs/xfs/xfs_inode_item.c        |    4 +-
 fs/xfs/xfs_inode_item.h        |    8 +
 fs/xfs/xfs_itable.c            |    5 +-
 fs/xfs/xfs_log.c               |   61 ++--
 fs/xfs/xfs_log_priv.h          |    6 +-
 fs/xfs/xfs_log_recover.c       |   19 +-
 fs/xfs/xfs_mount.c             |   49 ++-
 fs/xfs/xfs_mount.h             |   24 +-
 fs/xfs/xfs_rename.c            |   45 +--
 fs/xfs/xfs_sb.h                |  106 +++----
 fs/xfs/xfs_trans.h             |    1 -
 fs/xfs/xfs_trans_buf.c         |    3 +-
 fs/xfs/xfs_utils.c             |   28 +--
 fs/xfs/xfs_utils.h             |    1 -
 fs/xfs/xfs_vfsops.c            |   38 +--
 fs/xfs/xfs_vnodeops.c          |  328 ++++++---------------
 fs/xfs/xfs_vnodeops.h          |   14 +-
 41 files changed, 1042 insertions(+), 1431 deletions(-)
##
# git /pub/scm/linux/kernel/git/czankel/xtensa-2.6.git	 testing	xtensa
##
Removed arch/xtensa/boot/ramdisk/Makefile
Merge made by recursive.
 arch/xtensa/Kconfig               |   65 ++++++++++++++++++++++++-----------
 arch/xtensa/Makefile              |   68 +++++++++++++-----------------------
 arch/xtensa/boot/ramdisk/Makefile |   23 ------------
 arch/xtensa/configs/iss_defconfig |    2 +
 arch/xtensa/mm/init.c             |    1 -
 5 files changed, 71 insertions(+), 88 deletions(-)
 delete mode 100644 arch/xtensa/boot/ramdisk/Makefile
##
# gitfetch /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master		x86
##
##
# revert e14b8e9dd704ad37756c0a9ab14c7ccb1e398028 x86
##
Removed localversion-x86-latest.git
Created commit 17a01e8: Revert "x86: add x86-latest.git tag"
 1 files changed, 0 insertions(+), 1 deletions(-)
 delete mode 100644 localversion-x86-latest.git
##
# merge x86 resolve /home/jejb/x86-fixup.diff
##
Auto-merged Documentation/kernel-parameters.txt
Auto-merged arch/arm/Kconfig
Auto-merged arch/x86/Kconfig
Auto-merged arch/x86/kernel/Makefile
Auto-merged arch/x86/kernel/reboot.c
Auto-merged arch/x86/kernel/setup_32.c
Auto-merged arch/x86/kernel/setup_64.c
Removed arch/x86/kernel/smp_32.c
Removed arch/x86/kernel/smp_64.c
Removed arch/x86/kernel/smpboot_64.c
Auto-merged arch/x86/kernel/traps_32.c
Auto-merged arch/x86/kernel/traps_64.c
Removed arch/x86/lib/bitops_32.c
Removed arch/x86/mach-rdc321x/wdt.c
Removed arch/x86/mm/Makefile_32
Removed arch/x86/mm/Makefile_64
Auto-merged arch/x86/pci/acpi.c
CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c
Auto-merged arch/x86/pci/common.c
Auto-merged arch/x86/pci/i386.c
Auto-merged arch/x86/pci/pci.h
CONFLICT (content): Merge conflict in arch/x86/pci/pci.h
Auto-merged drivers/base/core.c
Auto-merged drivers/misc/Makefile
Auto-merged drivers/pci/pci-sysfs.c
Auto-merged drivers/pci/probe.c
Auto-merged drivers/serial/serial_core.c
Removed include/asm-x86/mach-default/mach_reboot.h
Removed include/asm-x86/nmi_32.h
Removed include/asm-x86/nmi_64.h
Removed include/asm-x86/pgalloc_32.h
Removed include/asm-x86/pgalloc_64.h
Auto-merged include/linux/ide.h
Auto-merged include/linux/kernel.h
Auto-merged include/linux/netdevice.h
Auto-merged include/linux/pci.h
Auto-merged include/linux/sched.h
Auto-merged include/linux/skbuff.h
Auto-merged include/net/inet_sock.h
Auto-merged include/net/tcp.h
Auto-merged init/main.c
Auto-merged lib/Kconfig.debug
Created commit c856966: Resolve Patch: /home/jejb/x86-fixup.diff
##
# git /pub/scm/linux/kernel/git/aegl/linux-2.6.git	release		ia64-release
##
Already up-to-date.
##
# quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/	doc
##
2.6.25-rc5-git2 to baadac8b10c5ac15ce3d26b68fa266c8889b163f
Using base baadac8b10c5ac15ce3d26b68fa266c8889b163f
docbook-audit-prms.patch
docsrc-spi-split-fix.patch
kconfig_allconfig_docv2.patch
move-smart-config.patch
kerndoc-dup-section-name-err.patch
##
# merge doc
##
Auto-merged Documentation/00-INDEX
Auto-merged kernel/audit.c
Auto-merged scripts/kernel-doc
Merge made by recursive.
 Documentation/00-INDEX                      |    2