Switched to branch "2.6.25-mc3"
Switched to branch "ide"
Switched to branch "2.6.25-mc3"
Already on "2.6.25-mc3"
Automatic merge failed; fix conflicts and then commit the result.
fatal: Not a valid object name: '2.6.25'.
Switched to branch "gregkh-driver"
Checking out files:   3% (12/393)   
Checking out files:   4% (16/393)   
Checking out files:   5% (20/393)   
Checking out files:   6% (24/393)   
Checking out files:   7% (28/393)   
Checking out files:   8% (32/393)   
Checking out files:   9% (36/393)   
Checking out files:  10% (40/393)   
Checking out files:  11% (44/393)   
Checking out files:  12% (48/393)   
Checking out files:  13% (52/393)   
Checking out files:  14% (56/393)   
Checking out files:  15% (59/393)   
Checking out files:  16% (63/393)   
Checking out files:  17% (67/393)   
Checking out files:  18% (71/393)   
Checking out files:  19% (75/393)   
Checking out files:  20% (79/393)   
Checking out files:  21% (83/393)   
Checking out files:  22% (87/393)   
Checking out files:  23% (91/393)   
Checking out files:  24% (95/393)   
Checking out files:  24% (98/393)   
Checking out files:  25% (99/393)   
Checking out files:  26% (103/393)   
Checking out files:  27% (107/393)   
Checking out files:  28% (111/393)   
Checking out files:  29% (114/393)   
Checking out files:  30% (118/393)   
Checking out files:  31% (122/393)   
Checking out files:  32% (126/393)   
Checking out files:  33% (130/393)   
Checking out files:  34% (134/393)   
Checking out files:  35% (138/393)   
Checking out files:  36% (142/393)   
Checking out files:  37% (146/393)   
Checking out files:  38% (150/393)   
Checking out files:  39% (154/393)   
Checking out files:  40% (158/393)   
Checking out files:  41% (162/393)   
Checking out files:  42% (166/393)   
Checking out files:  43% (169/393)   
Checking out files:  44% (173/393)   
Checking out files:  45% (177/393)   
Checking out files:  46% (181/393)   
Checking out files:  47% (185/393)   
Checking out files:  48% (189/393)   
Checking out files:  49% (193/393)   
Checking out files:  50% (197/393)   
Checking out files:  51% (201/393)   
Checking out files:  52% (205/393)   
Checking out files:  53% (209/393)   
Checking out files:  54% (213/393)   
Checking out files:  55% (217/393)   
Checking out files:  55% (219/393)   
Checking out files:  56% (221/393)   
Checking out files:  57% (225/393)   
Checking out files:  58% (228/393)   
Checking out files:  59% (232/393)   
Checking out files:  60% (236/393)   
Checking out files:  61% (240/393)   
Checking out files:  62% (244/393)   
Checking out files:  63% (248/393)   
Checking out files:  64% (252/393)   
Checking out files:  65% (256/393)   
Checking out files:  66% (260/393)   
Checking out files:  67% (264/393)   
Checking out files:  68% (268/393)   
Checking out files:  69% (272/393)   
Checking out files:  70% (276/393)   
Checking out files:  71% (280/393)   
Checking out files:  72% (283/393)   
Checking out files:  73% (287/393)   
Checking out files:  74% (291/393)   
Checking out files:  75% (295/393)   
Checking out files:  76% (299/393)   
Checking out files:  77% (303/393)   
Checking out files:  78% (307/393)   
Checking out files:  79% (311/393)   
Checking out files:  80% (315/393)   
Checking out files:  81% (319/393)   
Checking out files:  82% (323/393)   
Checking out files:  83% (327/393)   
Checking out files:  84% (331/393)   
Checking out files:  85% (335/393)   
Checking out files:  86% (338/393)   
Checking out files:  87% (342/393)   
Checking out files:  88% (346/393)   
Checking out files:  89% (350/393)   
Checking out files:  90% (354/393)   
Checking out files:  91% (358/393)   
Checking out files:  92% (362/393)   
Checking out files:  93% (366/393)   
Checking out files:  94% (370/393)   
Checking out files:  95% (374/393)   
Checking out files:  96% (378/393)   
Checking out files:  97% (382/393)   
Checking out files:  98% (386/393)   
Checking out files:  99% (390/393)   
Checking out files: 100% (393/393)   
Checking out files: 100% (393/393), done.
Switched to branch "2.6.25-mc3"
Checking out files:   2% (9/393)   
Checking out files:   3% (12/393)   
Checking out files:   3% (13/393)   
Checking out files:   4% (16/393)   
Checking out files:   5% (20/393)   
Checking out files:   6% (24/393)   
Checking out files:   7% (28/393)   
Checking out files:   8% (32/393)   
Checking out files:   9% (36/393)   
Checking out files:  10% (40/393)   
Checking out files:  11% (44/393)   
Checking out files:  12% (48/393)   
Checking out files:  13% (52/393)   
Checking out files:  14% (56/393)   
Checking out files:  15% (59/393)   
Checking out files:  16% (63/393)   
Checking out files:  17% (67/393)   
Checking out files:  18% (71/393)   
Checking out files:  18% (73/393)   
Checking out files:  19% (75/393)   
Checking out files:  20% (79/393)   
Checking out files:  21% (83/393)   
Checking out files:  22% (87/393)   
Checking out files:  23% (91/393)   
Checking out files:  24% (95/393)   
Checking out files:  25% (99/393)   
Checking out files:  26% (103/393)   
Checking out files:  27% (107/393)   
Checking out files:  28% (111/393)   
Checking out files:  29% (114/393)   
Checking out files:  30% (118/393)   
Checking out files:  31% (122/393)   
Checking out files:  32% (126/393)   
Checking out files:  33% (130/393)   
Checking out files:  34% (134/393)   
Checking out files:  35% (138/393)   
Checking out files:  36% (142/393)   
Checking out files:  37% (146/393)   
Checking out files:  38% (150/393)   
Checking out files:  39% (154/393)   
Checking out files:  40% (158/393)   
Checking out files:  41% (162/393)   
Checking out files:  42% (166/393)   
Checking out files:  43% (169/393)   
Checking out files:  44% (173/393)   
Checking out files:  44% (174/393)   
Checking out files:  45% (177/393)   
Checking out files:  46% (181/393)   
Checking out files:  46% (183/393)   
Checking out files:  47% (185/393)   
Checking out files:  48% (189/393)   
Checking out files:  49% (193/393)   
Checking out files:  50% (197/393)   
Checking out files:  51% (201/393)   
Checking out files:  52% (205/393)   
Checking out files:  53% (209/393)   
Checking out files:  54% (213/393)   
Checking out files:  55% (217/393)   
Checking out files:  56% (221/393)   
Checking out files:  57% (225/393)   
Checking out files:  58% (228/393)   
Checking out files:  59% (232/393)   
Checking out files:  60% (236/393)   
Checking out files:  61% (240/393)   
Checking out files:  62% (244/393)   
Checking out files:  63% (248/393)   
Checking out files:  64% (252/393)   
Checking out files:  65% (256/393)   
Checking out files:  66% (260/393)   
Checking out files:  67% (264/393)   
Checking out files:  68% (268/393)   
Checking out files:  69% (272/393)   
Checking out files:  70% (276/393)   
Checking out files:  71% (280/393)   
Checking out files:  72% (283/393)   
Checking out files:  73% (287/393)   
Checking out files:  74% (291/393)   
Checking out files:  75% (295/393)   
Checking out files:  76% (299/393)   
Checking out files:  77% (303/393)   
Checking out files:  78% (307/393)   
Checking out files:  79% (311/393)   
Checking out files:  80% (315/393)   
Checking out files:  81% (319/393)   
Checking out files:  82% (323/393)   
Checking out files:  83% (327/393)   
Checking out files:  84% (331/393)   
Checking out files:  85% (335/393)   
Checking out files:  86% (338/393)   
Checking out files:  87% (342/393)   
Checking out files:  88% (346/393)   
Checking out files:  88% (348/393)   
Checking out files:  89% (350/393)   
Checking out files:  90% (354/393)   
Checking out files:  91% (358/393)   
Checking out files:  92% (362/393)   
Checking out files:  93% (366/393)   
Checking out files:  94% (370/393)   
Checking out files:  95% (374/393)   
Checking out files:  96% (378/393)   
Checking out files:  97% (382/393)   
Checking out files:  98% (386/393)   
Checking out files:  99% (390/393)   
Checking out files: 100% (393/393)   
Checking out files: 100% (393/393), done.
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.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Checking out files:   1% (4/393)   
Checking out files:   2% (8/393)   
Checking out files:   3% (12/393)   
Checking out files:   4% (16/393)   
Checking out files:   5% (20/393)   
Checking out files:   6% (24/393)   
Checking out files:   7% (28/393)   
Checking out files:   8% (32/393)   
Checking out files:   9% (36/393)   
Checking out files:  10% (40/393)   
Checking out files:  11% (44/393)   
Checking out files:  12% (48/393)   
Checking out files:  13% (52/393)   
Checking out files:  14% (56/393)   
Checking out files:  15% (59/393)   
Checking out files:  16% (63/393)   
Checking out files:  17% (67/393)   
Checking out files:  18% (71/393)   
Checking out files:  19% (75/393)   
Checking out files:  20% (79/393)   
Checking out files:  21% (83/393)   
Checking out files:  22% (87/393)   
Checking out files:  23% (91/393)   
Checking out files:  24% (95/393)   
Checking out files:  25% (99/393)   
Checking out files:  26% (103/393)   
Checking out files:  27% (107/393)   
Checking out files:  28% (111/393)   
Checking out files:  29% (114/393)   
Checking out files:  30% (118/393)   
Checking out files:  31% (122/393)   
Checking out files:  32% (126/393)   
Checking out files:  33% (130/393)   
Checking out files:  34% (134/393)   
Checking out files:  35% (138/393)   
Checking out files:  36% (142/393)   
Checking out files:  37% (146/393)   
Checking out files:  38% (150/393)   
Checking out files:  39% (154/393)   
Checking out files:  40% (158/393)   
Checking out files:  41% (162/393)   
Checking out files:  42% (166/393)   
Checking out files:  43% (169/393)   
Checking out files:  44% (173/393)   
Checking out files:  45% (177/393)   
Checking out files:  46% (181/393)   
Checking out files:  47% (185/393)   
Checking out files:  48% (189/393)   
Checking out files:  49% (193/393)   
Checking out files:  50% (197/393)   
Checking out files:  51% (201/393)   
Checking out files:  52% (205/393)   
Checking out files:  53% (209/393)   
Checking out files:  54% (213/393)   
Checking out files:  55% (217/393)   
Checking out files:  56% (221/393)   
Checking out files:  57% (225/393)   
Checking out files:  58% (228/393)   
Checking out files:  59% (232/393)   
Checking out files:  60% (236/393)   
Checking out files:  61% (240/393)   
Checking out files:  62% (244/393)   
Checking out files:  63% (248/393)   
Checking out files:  64% (252/393)   
Checking out files:  65% (256/393)   
Checking out files:  66% (260/393)   
Checking out files:  67% (264/393)   
Checking out files:  68% (268/393)   
Checking out files:  69% (272/393)   
Checking out files:  70% (276/393)   
Checking out files:  71% (280/393)   
Checking out files:  72% (283/393)   
Checking out files:  73% (287/393)   
Checking out files:  74% (291/393)   
Checking out files:  75% (295/393)   
Checking out files:  76% (299/393)   
Checking out files:  77% (303/393)   
Checking out files:  78% (307/393)   
Checking out files:  79% (311/393)   
Checking out files:  80% (315/393)   
Checking out files:  81% (319/393)   
Checking out files:  82% (323/393)   
Checking out files:  83% (327/393)   
Checking out files:  84% (331/393)   
Checking out files:  85% (335/393)   
Checking out files:  86% (338/393)   
Checking out files:  87% (342/393)   
Checking out files:  88% (346/393)   
Checking out files:  89% (350/393)   
Checking out files:  90% (354/393)   
Checking out files:  91% (358/393)   
Checking out files:  92% (362/393)   
Checking out files:  93% (366/393)   
Checking out files:  94% (370/393)   
Checking out files:  95% (374/393)   
Checking out files:  96% (378/393)   
Checking out files:  97% (382/393)   
Checking out files:  98% (386/393)   
Checking out files:  99% (390/393)   
Checking out files:  99% (392/393)   
Checking out files: 100% (393/393)   
Checking out files: 100% (393/393), done.
Switched to branch "2.6.25-mc3"
Checking out files:  15% (41/268)   
Checking out files:  16% (43/268)   
Checking out files:  17% (46/268)   
Checking out files:  18% (49/268)   
Checking out files:  19% (51/268)   
Checking out files:  20% (54/268)   
Checking out files:  21% (57/268)   
Checking out files:  22% (59/268)   
Checking out files:  23% (62/268)   
Checking out files:  24% (65/268)   
Checking out files:  25% (67/268)   
Checking out files:  26% (70/268)   
Checking out files:  27% (73/268)   
Checking out files:  28% (76/268)   
Checking out files:  29% (78/268)   
Checking out files:  30% (81/268)   
Checking out files:  31% (84/268)   
Checking out files:  32% (86/268)   
Checking out files:  33% (89/268)   
Checking out files:  34% (92/268)   
Checking out files:  35% (94/268)   
Checking out files:  36% (97/268)   
Checking out files:  37% (100/268)   
Checking out files:  38% (102/268)   
Checking out files:  39% (105/268)   
Checking out files:  40% (108/268)   
Checking out files:  41% (110/268)   
Checking out files:  42% (113/268)   
Checking out files:  43% (116/268)   
Checking out files:  44% (118/268)   
Checking out files:  45% (121/268)   
Checking out files:  46% (124/268)   
Checking out files:  47% (126/268)   
Checking out files:  48% (129/268)   
Checking out files:  49% (132/268)   
Checking out files:  50% (134/268)   
Checking out files:  51% (137/268)   
Checking out files:  52% (140/268)   
Checking out files:  53% (143/268)   
Checking out files:  54% (145/268)   
Checking out files:  55% (148/268)   
Checking out files:  56% (151/268)   
Checking out files:  57% (153/268)   
Checking out files:  58% (156/268)   
Checking out files:  59% (159/268)   
Checking out files:  60% (161/268)   
Checking out files:  61% (164/268)   
Checking out files:  62% (167/268)   
Checking out files:  63% (169/268)   
Checking out files:  64% (172/268)   
Checking out files:  65% (175/268)   
Checking out files:  66% (177/268)   
Checking out files:  67% (180/268)   
Checking out files:  68% (183/268)   
Checking out files:  69% (185/268)   
Checking out files:  70% (188/268)   
Checking out files:  71% (191/268)   
Checking out files:  72% (193/268)   
Checking out files:  73% (196/268)   
Checking out files:  74% (199/268)   
Checking out files:  75% (201/268)   
Checking out files:  76% (204/268)   
Checking out files:  77% (207/268)   
Checking out files:  78% (210/268)   
Checking out files:  79% (212/268)   
Checking out files:  80% (215/268)   
Checking out files:  81% (218/268)   
Checking out files:  82% (220/268)   
Checking out files:  83% (223/268)   
Checking out files:  84% (226/268)   
Checking out files:  85% (228/268)   
Checking out files:  86% (231/268)   
Checking out files:  87% (234/268)   
Checking out files:  88% (236/268)   
Checking out files:  89% (239/268)   
Checking out files:  90% (242/268)   
Checking out files:  91% (244/268)   
Checking out files:  92% (247/268)   
Checking out files:  93% (250/268)   
Checking out files:  94% (252/268)   
Checking out files:  95% (255/268)   
Checking out files:  96% (258/268)   
Checking out files:  97% (260/268)   
Checking out files:  98% (263/268)   
Checking out files:  99% (266/268)   
Checking out files: 100% (268/268)   
Checking out files: 100% (268/268), done.
Switched to branch "gregkh-pci"
Switched to branch "2.6.25-mc3"
Already on "2.6.25-mc3"
Automatic merge failed; fix conflicts and then commit the result.
Checking out files:  45% (122/268)   
Checking out files:  46% (124/268)   
Checking out files:  47% (126/268)   
Checking out files:  48% (129/268)   
Checking out files:  49% (132/268)   
Checking out files:  50% (134/268)   
Checking out files:  51% (137/268)   
Checking out files:  52% (140/268)   
Checking out files:  53% (143/268)   
Checking out files:  54% (145/268)   
Checking out files:  55% (148/268)   
Checking out files:  56% (151/268)   
Checking out files:  57% (153/268)   
Checking out files:  58% (156/268)   
Checking out files:  59% (159/268)   
Checking out files:  60% (161/268)   
Checking out files:  61% (164/268)   
Checking out files:  62% (167/268)   
Checking out files:  63% (169/268)   
Checking out files:  64% (172/268)   
Checking out files:  65% (175/268)   
Checking out files:  66% (177/268)   
Checking out files:  67% (180/268)   
Checking out files:  68% (183/268)   
Checking out files:  69% (185/268)   
Checking out files:  70% (188/268)   
Checking out files:  71% (191/268)   
Checking out files:  72% (193/268)   
Checking out files:  73% (196/268)   
Checking out files:  74% (199/268)   
Checking out files:  75% (201/268)   
Checking out files:  76% (204/268)   
Checking out files:  77% (207/268)   
Checking out files:  78% (210/268)   
Checking out files:  79% (212/268)   
Checking out files:  80% (215/268)   
Checking out files:  81% (218/268)   
Checking out files:  82% (220/268)   
Checking out files:  83% (223/268)   
Checking out files:  84% (226/268)   
Checking out files:  85% (228/268)   
Checking out files:  86% (231/268)   
Checking out files:  87% (234/268)   
Checking out files:  88% (236/268)   
Checking out files:  89% (239/268)   
Checking out files:  90% (242/268)   
Checking out files:  91% (244/268)   
Checking out files:  92% (247/268)   
Checking out files:  93% (250/268)   
Checking out files:  94% (252/268)   
Checking out files:  95% (255/268)   
Checking out files:  96% (258/268)   
Checking out files:  97% (260/268)   
Checking out files:  98% (263/268)   
Checking out files:  99% (266/268)   
Checking out files: 100% (268/268)   
Checking out files: 100% (268/268), done.
Switched to branch "gregkh-usb"
.dotest/patch:225: space before tab in indent.
 	 */
warning: 1 line adds whitespace errors.
.dotest/patch:19: space before tab in indent.
 	unsigned authenticated:1;
warning: 1 line adds whitespace errors.
.dotest/patch:14: space before tab in indent.
 		/*
.dotest/patch:15: space before tab in indent.
 		 * If device is WUSB, we already assigned an
.dotest/patch:16: space before tab in indent.
 		 * unauthorized address in the Connect Ack sequence;
.dotest/patch:17: space before tab in indent.
 		 * authorization will assign the final address.
.dotest/patch:18: space before tab in indent.
 		 */
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
.dotest/patch:2592: space before tab in indent.
 		dbg(1," %s : file is NULL", __func__);
.dotest/patch:2600: space before tab in indent.
 		dbg(1," %s : object is NULL", __func__);
.dotest/patch:8357: space before tab in indent.
  	dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length);
.dotest/patch:8732: space before tab in indent.
		  	dbg ("%s - Update complete 0x%x", __func__, status);
.dotest/patch:8796: space before tab in indent.
	  		dbg ("%s - Error downloading operational code image", __func__);
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
.dotest/patch:345: space before tab in indent.
       		mct_u232_set_modem_ctrl(serial, priv->control_state);
warning: 1 line adds whitespace errors.
Switched to branch "2.6.25-mc3"
Already on "2.6.25-mc3"
Switched to branch "gregkh-ldp"
.dotest/patch:501: space before tab in indent.
 	whcrc->umc_dev = umc_dev;
.dotest/patch:516: space before tab in indent.
 	result = whcrc_setup_rc_umc(whcrc);
.dotest/patch:518: space before tab in indent.
 		dev_err(dev, "Can't setup RC UMC interface: %d\n", result);
.dotest/patch:523: space before tab in indent.
 		dev_err(dev, "Can't setup RC interface: %d\n", result);
.dotest/patch:588: space before tab in indent.
 	.probe = whcrc_probe,
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
.dotest/patch:974: space before tab in indent.
 	const struct firmware *fw;
.dotest/patch:1334: space before tab in indent.
 	const struct firmware *fw;
.dotest/patch:3516: space before tab in indent.
    				"Dropping\n", untd_hdr->reserved1);
.dotest/patch:4812: space before tab in indent.
 	/*
warning: 4 lines add whitespace errors.
.dotest/patch:1896: space before tab in indent.
				 					0xd3),
.dotest/patch:1911: space before tab in indent.
				  			GO7007_SENSOR_TV) &&
.dotest/patch:1915: space before tab in indent.
				  			GO7007_SENSOR_TV) &&
.dotest/patch:2125: space before tab in indent.
		 			(1 << 14) | (1 << 9) : 0) |
.dotest/patch:2128: space before tab in indent.
			 	GO7007_SENSOR_CONFIG_MASK),
warning: 5 lines add whitespace errors.
.dotest/patch:58: trailing whitespace.
obj-$(CONFIG_SLICOSS) += slicoss.o
.dotest/patch:24450: space before tab in indent.
 	ushort		DramRomFn;		// 14 Dram/Rom function
warning: 2 lines add whitespace errors.
Switched to branch "2.6.25-mc3"
error: branch 'agp' not found.
fatal: Not a valid object name: '2.6.25'.
Checking out files:  24% (348/1414)   
Checking out files:  25% (354/1414)   
Checking out files:  26% (368/1414)   
Checking out files:  27% (382/1414)   
Checking out files:  28% (396/1414)   
Checking out files:  29% (411/1414)   
Checking out files:  30% (425/1414)   
Checking out files:  31% (439/1414)   
Checking out files:  32% (453/1414)   
Checking out files:  33% (467/1414)   
Checking out files:  34% (481/1414)   
Checking out files:  35% (495/1414)   
Checking out files:  36% (510/1414)   
Checking out files:  37% (524/1414)   
Checking out files:  38% (538/1414)   
Checking out files:  39% (552/1414)   
Checking out files:  40% (566/1414)   
Checking out files:  41% (580/1414)   
Checking out files:  42% (594/1414)   
Checking out files:  43% (609/1414)   
Checking out files:  44% (623/1414)   
Checking out files:  45% (637/1414)   
Checking out files:  46% (651/1414)   
Checking out files:  47% (665/1414)   
Checking out files:  48% (679/1414)   
Checking out files:  49% (693/1414)   
Checking out files:  50% (707/1414)   
Checking out files:  51% (722/1414)   
Checking out files:  52% (736/1414)   
Checking out files:  53% (750/1414)   
Checking out files:  53% (761/1414)   
Checking out files:  54% (764/1414)   
Checking out files:  55% (778/1414)   
Checking out files:  56% (792/1414)   
Checking out files:  57% (806/1414)   
Checking out files:  58% (821/1414)   
Checking out files:  59% (835/1414)   
Checking out files:  60% (849/1414)   
Checking out files:  61% (863/1414)   
Checking out files:  62% (877/1414)   
Checking out files:  63% (891/1414)   
Checking out files:  64% (905/1414)   
Checking out files:  65% (920/1414)   
Checking out files:  66% (934/1414)   
Checking out files:  67% (948/1414)   
Checking out files:  68% (962/1414)   
Checking out files:  69% (976/1414)   
Checking out files:  70% (990/1414)   
Checking out files:  71% (1004/1414)   
Checking out files:  72% (1019/1414)   
Checking out files:  73% (1033/1414)   
Checking out files:  74% (1047/1414)   
Checking out files:  75% (1061/1414)   
Checking out files:  76% (1075/1414)   
Checking out files:  77% (1089/1414)   
Checking out files:  77% (1098/1414)   
Checking out files:  78% (1103/1414)   
Checking out files:  79% (1118/1414)   
Checking out files:  80% (1132/1414)   
Checking out files:  81% (1146/1414)   
Checking out files:  82% (1160/1414)   
Checking out files:  83% (1174/1414)   
Checking out files:  84% (1188/1414)   
Checking out files:  85% (1202/1414)   
Checking out files:  86% (1217/1414)   
Checking out files:  87% (1231/1414)   
Checking out files:  88% (1245/1414)   
Checking out files:  89% (1259/1414)   
Checking out files:  90% (1273/1414)   
Checking out files:  91% (1287/1414)   
Checking out files:  92% (1301/1414)   
Checking out files:  93% (1316/1414)   
Checking out files:  94% (1330/1414)   
Checking out files:  95% (1344/1414)   
Checking out files:  96% (1358/1414)   
Checking out files:  97% (1372/1414)   
Checking out files:  98% (1386/1414)   
Checking out files:  99% (1400/1414)   
Checking out files: 100% (1414/1414)   
Checking out files: 100% (1414/1414), done.
Switched to branch "i2c"
Checking out files:  39% (570/1448)   
Checking out files:  40% (580/1448)   
Checking out files:  41% (594/1448)   
Checking out files:  42% (609/1448)   
Checking out files:  43% (623/1448)   
Checking out files:  44% (638/1448)   
Checking out files:  45% (652/1448)   
Checking out files:  46% (667/1448)   
Checking out files:  47% (681/1448)   
Checking out files:  48% (696/1448)   
Checking out files:  49% (710/1448)   
Checking out files:  50% (724/1448)   
Checking out files:  51% (739/1448)   
Checking out files:  52% (753/1448)   
Checking out files:  53% (768/1448)   
Checking out files:  54% (782/1448)   
Checking out files:  55% (797/1448)   
Checking out files:  56% (811/1448)   
Checking out files:  57% (826/1448)   
Checking out files:  58% (840/1448)   
Checking out files:  59% (855/1448)   
Checking out files:  60% (869/1448)   
Checking out files:  61% (884/1448)   
Checking out files:  62% (898/1448)   
Checking out files:  63% (913/1448)   
Checking out files:  64% (927/1448)   
Checking out files:  65% (942/1448)   
Checking out files:  65% (949/1448)   
Checking out files:  66% (956/1448)   
Checking out files:  67% (971/1448)   
Checking out files:  68% (985/1448)   
Checking out files:  69% (1000/1448)   
Checking out files:  70% (1014/1448)   
Checking out files:  71% (1029/1448)   
Checking out files:  72% (1043/1448)   
Checking out files:  73% (1058/1448)   
Checking out files:  74% (1072/1448)   
Checking out files:  75% (1086/1448)   
Checking out files:  76% (1101/1448)   
Checking out files:  77% (1115/1448)   
Checking out files:  78% (1130/1448)   
Checking out files:  79% (1144/1448)   
Checking out files:  80% (1159/1448)   
Checking out files:  81% (1173/1448)   
Checking out files:  82% (1188/1448)   
Checking out files:  82% (1201/1448)   
Checking out files:  83% (1202/1448)   
Checking out files:  84% (1217/1448)   
Checking out files:  85% (1231/1448)   
Checking out files:  86% (1246/1448)   
Checking out files:  87% (1260/1448)   
Checking out files:  87% (1267/1448)   
Checking out files:  88% (1275/1448)   
Checking out files:  89% (1289/1448)   
Checking out files:  90% (1304/1448)   
Checking out files:  91% (1318/1448)   
Checking out files:  92% (1333/1448)   
Checking out files:  93% (1347/1448)   
Checking out files:  94% (1362/1448)   
Checking out files:  95% (1376/1448)   
Checking out files:  96% (1391/1448)   
Checking out files:  97% (1405/1448)   
Checking out files:  98% (1420/1448)   
Checking out files:  99% (1434/1448)   
Checking out files: 100% (1448/1448)   
Checking out files: 100% (1448/1448), done.
Switched to branch "2.6.25-mc3"
Already on "2.6.25-mc3"
Already on "2.6.25-mc3"
Automatic merge failed; fix conflicts and then commit the result.
Already on "2.6.25-mc3"
Automatic merge failed; fix conflicts and then commit the result.
Already on "2.6.25-mc3"
Automatic merge failed; fix conflicts and then commit the result.
Already on "2.6.25-mc3"
Automatic merge failed; fix conflicts and then commit the result.
From /home/rmk/linux-2.6-arm
   120dd64..4b119e2  master     -> arm
fatal: The remote end hung up unexpectedly
error: branch 'mips-devel' not found.
From git://git.infradead.org/mtd-2.6
 * [new branch]      master     -> mtd
warning: too many files, skipping inexact rename detection
Already on "2.6.25-mc3"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
Already on "2.6.25-mc3"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
From git://git.infradead.org/battery-2.6
 * [new branch]      master     -> battery
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
remote: Counting objects: 7219, done.
remote: Compressing objects:   0% (1/885)   
remote: Compressing objects:   1% (9/885)   
remote: Compressing objects:   2% (18/885)   
remote: Compressing objeremote: cts:   3% (27/885)   
remote: Compressing objects:   4% (36/885)   
remote: Compressing objects:   5% (45/885)   
remote: Compressing objects:   6% (54/remote: 885)   
remote: Compressing objects:   7% (62/885)   
remote: Compressing objects:   8% (71/885)   
remote: Compressing objects:   9% (80/885)   
remote: Compreremote: ssing objects:  10% (89/885)   
remote: Compressing objects:  11% (98/885)   
remote: Compressing objects:  12% (107/885)   
remote: Compressing objectsremote: :  13% (116/885)   
remote: Compressing objects:  14% (124/885)   
remote: Compressing objects:  15% (133/885)   
remote: Compressing objects:  16% (142remote: /885)   
remote: Compressing objects:  17% (151/885)   
remote: Compressing objects:  18% (160/885)   
remote: Compressing objects:  19% (169/885)   
remote: Coremote: mpressing objects:  20% (177/885)   
remote: Compressing objects:  21% (186/885)   
remote: Compressing objects:  22% (195/885)   
remote: Compressing oremote: bjects:  23% (204/885)   
remote: Compressing objects:  24% (213/885)   
remote: Compressing objects:  25% (222/885)   
remote: Compressing objects:  26Receiving objects:   0% (1/6609)   
Receiving objects:   1% (67/6609)   
Receiving objects:   2% (133/6609)   
remote: % (231/885)   
remote: Compressing objects:  27% (239/885)   
remote: Compressing objects:  28% (248/885)   
remote: Compressing objects:  29% (257/885)remote:    
remote: Compressing objects:  30% (266/885)   
remote: Compressing objects:  31% (275/885)   
remote: Compressing objects:  32% (284/885)   
remote: Compresremote: sing objects:  33% (293/885)   
remote: Compressing objects:  34% (301/885)   
remote: Compressing objects:  35% (310/885)   
remote: Compressing objectremote: s:  36% (319/885)   
remote: Compressing objects:  37% (328/885)   
remote: Compressing objects:  38% (337/885)   
remote: Compressing objects:  39% (34remote: 6/885)   
remote: Compressing objects:  40% (354/885)   
remote: Compressing objects:  41% (363/885)   
remote: Compressing objects:  42% (372/885)   
remote: Cremote: ompressing objects:  43% (381/885)   
remote: Compressing objects:  44% (390/885)   
remote: Compressing objects:  45% (399/885)   
remote: Compressing remote: objects:  46% (408/885)   
remote: Compressing objects:  47% (416/885)   
remote: Compressing objects:  48% (425/885)   
remote: Compressing objects:  4Receiving objects:   3% (199/6609)   
Receiving objects:   4% (265/6609)   
Receiving objects:   5% (331/6609)   
remote: 9% (434/885)   
remote: Compressing objects:  50% (443/885)   
remote: Compressing objects:  51% (452/885)   
remote: Compressing objects:  52% (461/885remote: )   
remote: Compressing objects:  53% (470/885)   
remote: Compressing objects:  54% (478/885)   
remote: Compressing objects:  55% (487/885)   
remote: Compreremote: ssing objects:  56% (496/885)   
remote: Compressing objects:  57% (505/885)   
remote: Compressing objects:  58% (514/885)   
remote: Compressing objecremote: ts:  59% (523/885)   
remote: Compressing objects:  60% (531/885)   
remote: Compressing objects:  61% (540/885)   
remote: Compressing objects:  62% (5Receiving objects:   6% (397/6609)   
remote: essing objects:  79% (700/885)   
remote: Compressing objects:  80% (708/885)   
remote: Compressing objects:  81% (717/885)   
remote: Compressing objeremote: cts:  82% (726/885)   
remote: Compressing objects:  83% (735/885)   
remote: Compressing objects:  84% (744/885)   
remote: Compressing objects:  85% (Receiving objects:   7% (463/6609)   
remote: 753/885)   
remote: Compressing objects:  86% (762/885)   
remote: Compressing objects:  87% (770/885)   
remote: Compressing objects:  88% (779/885)   Receiving objects:   8% (529/6609)   
remote: 
remote: Compressing objects:  89% (788/885)   
remote: Compressing objects:  90% (797/885)   
remote: Compressing objects:  91% (806/885)   
remote: Compressinremote: g objects:  92% (815/885)   
remote: Compressing objects:  93% (824/885)   
remote: Compressing objects:  94% (832/885)   
remote: Compressing objects: remote:  95% (841/885)   
remote: Compressing objects:  96% (850/885)   
remote: Compressing objects:  97% (859/885)   
remote: Compressing objects:  98% (868/8Receiving objects:   9% (595/6609)   
remote: 85)   
remote: Compressing objects:  99% (877/885)   
remote: Compressing objects: 100% (885/885)   
remote: Compressing objects: 100% (885/885), done.
Receiving objects:  10% (661/6609)   
Receiving objects:  11% (727/6609)   
Receiving objects:  12% (794/6609)   
Receiving objects:  13% (860/6609)   
Receiving objects:  14% (926/6609)   
Receiving objects:  15% (992/6609)   
Receiving objects:  16% (1058/6609)   
Receiving objects:  17% (1124/6609)   
Receiving objects:  18% (1190/6609)   
Receiving objects:  19% (1256/6609)   
Receiving objects:  20% (1322/6609)   
Receiving objects:  21% (1388/6609)   
Receiving objects:  22% (1454/6609)   
Receiving objects:  23% (1521/6609)   
Receiving objects:  24% (1587/6609)   
Receiving objects:  25% (1653/6609)   
Receiving objects:  26% (1719/6609)   
Receiving objects:  27% (1785/6609)   
Receiving objects:  28% (1851/6609)   
Receiving objects:  29% (1917/6609)   
Receiving objects:  30% (1983/6609)   
Receiving objects:  31% (2049/6609)   
Receiving objects:  32% (2115/6609)   
Receiving objects:  33% (2181/6609)   
Receiving objects:  34% (2248/6609)   
Receiving objects:  35% (2314/6609)   
Receiving objects:  36% (2380/6609)   
Receiving objects:  37% (2446/6609)   
Receiving objects:  38% (2512/6609)   
Receiving objects:  39% (2578/6609)   
Receiving objects:  40% (2644/6609)   
Receiving objects:  41% (2710/6609)   
Receiving objects:  42% (2776/6609)   
Receiving objects:  43% (2842/6609)   
Receiving objects:  44% (2908/6609)   
Receiving objects:  45% (2975/6609)   
Receiving objects:  46% (3041/6609)   
Receiving objects:  47% (3107/6609)   
Receiving objects:  48% (3173/6609)   
Receiving objects:  49% (3239/6609)   
Receiving objects:  50% (3305/6609)   
Receiving objects:  51% (3371/6609)   
Receiving objects:  52% (3437/6609)   
Receiving objects:  53% (3503/6609)   
Receiving objects:  54% (3569/6609)   
Receiving objects:  55% (3635/6609)   
Receiving objects:  56% (3702/6609)   
Receiving objects:  57% (3768/6609)   
Receiving objects:  58% (3834/6609)   
Receiving objects:  59% (3900/6609)   
Receiving objects:  60% (3966/6609)   
Receiving objects:  61% (4032/6609)   
Receiving objects:  62% (4098/6609)   
Receiving objects:  63% (4164/6609)   
Receiving objects:  64% (4230/6609)   
Receiving objects:  65% (4296/6609)   
Receiving objects:  66% (4362/6609)   
Receiving objects:  67% (4429/6609)   
Receiving objects:  68% (4495/6609)   
Receiving objects:  69% (4561/6609)   
Receiving objects:  70% (4627/6609)   
Receiving objects:  71% (4693/6609)   
Receiving objects:  72% (4759/6609)   
Receiving objects:  73% (4825/6609)   
Receiving objects:  74% (4891/6609)   
Receiving objects:  75% (4957/6609)   
remote: Total 6609 (delta 5714), reused 6609 (delta 5714)
Receiving objects:  76% (5023/6609)   
Receiving objects:  77% (5089/6609)   
Receiving objects:  78% (5156/6609)   
Receiving objects:  79% (5222/6609)   
Receiving objects:  80% (5288/6609)   
Receiving objects:  81% (5354/6609)   
Receiving objects:  82% (5420/6609)   
Receiving objects:  83% (5486/6609)   
Receiving objects:  84% (5552/6609)   
Receiving objects:  85% (5618/6609)   
Receiving objects:  86% (5684/6609)   
Receiving objects:  87% (5750/6609)   
Receiving objects:  88% (5816/6609)   
Receiving objects:  89% (5883/6609)   
Receiving objects:  90% (5949/6609)   
Receiving objects:  91% (6015/6609)   
Receiving objects:  92% (6081/6609)   
Receiving objects:  93% (6147/6609)   
Receiving objects:  94% (6213/6609)   
Receiving objects:  95% (6279/6609)   
Receiving objects:  96% (6345/6609)   
Receiving objects:  97% (6411/6609)   
Receiving objects:  98% (6477/6609)   
Receiving objects:  99% (6543/6609)   
Receiving objects: 100% (6609/6609)   
Receiving objects: 100% (6609/6609), 1015.10 KiB, done.
Resolving deltas:   0% (5/5714)   
Resolving deltas:   1% (58/5714)   
Resolving deltas:   2% (115/5714)   
Resolving deltas:   5% (306/5714)   
Resolving deltas:   6% (395/5714)   
Resolving deltas:   7% (436/5714)   
Resolving deltas:   8% (463/5714)   
Resolving deltas:   9% (523/5714)   
Resolving deltas:  10% (602/5714)   
Resolving deltas:  11% (629/5714)   
Resolving deltas:  13% (794/5714)   
Resolving deltas:  14% (820/5714)   
Resolving deltas:  15% (877/5714)   
Resolving deltas:  16% (916/5714)   
Resolving deltas:  19% (1109/5714)   
Resolving deltas:  21% (1241/5714)   
Resolving deltas:  25% (1472/5714)   
Resolving deltas:  33% (1901/5714)   
Resolving deltas:  34% (1985/5714)   
Resolving deltas:  36% (2061/5714)   
Resolving deltas:  39% (2269/5714)   
Resolving deltas:  41% (2363/5714)   
Resolving deltas:  44% (2549/5714)   
Resolving deltas:  45% (2572/5714)   
Resolving deltas:  55% (3196/5714)   
Resolving deltas:  56% (3200/5714)   
Resolving deltas:  57% (3257/5714)   
Resolving deltas:  58% (3338/5714)   
Resolving deltas:  59% (3385/5714)   
Resolving deltas:  60% (3432/5714)   
Resolving deltas:  61% (3486/5714)   
Resolving deltas:  62% (3545/5714)   
Resolving deltas:  63% (3601/5714)   
Resolving deltas:  64% (3658/5714)   
Resolving deltas:  65% (3715/5714)   
Resolving deltas:  66% (3776/5714)   
Resolving deltas:  67% (3833/5714)   
Resolving deltas:  68% (3919/5714)   
Resolving deltas:  69% (3946/5714)   
Resolving deltas:  70% (4000/5714)   
Resolving deltas:  77% (4422/5714)   
Resolving deltas:  78% (4458/5714)   
Resolving deltas:  79% (4515/5714)   
Resolving deltas:  80% (4573/5714)   
Resolving deltas:  81% (4629/5714)   
Resolving deltas:  82% (4686/5714)   
Resolving deltas:  83% (4743/5714)   
Resolving deltas:  84% (4800/5714)   
Resolving deltas:  85% (4857/5714)   
Resolving deltas:  86% (4923/5714)   
Resolving deltas:  86% (4934/5714)   
Resolving deltas:  87% (4973/5714)   
Resolving deltas:  88% (5043/5714)   
Resolving deltas:  90% (5170/5714)   
Resolving deltas:  91% (5201/5714)   
Resolving deltas:  92% (5269/5714)   
Resolving deltas:  93% (5332/5714)   
Resolving deltas:  97% (5582/5714)   
Resolving deltas:  98% (5642/5714)   
Resolving deltas:  99% (5682/5714)   
Resolving deltas: 100% (5714/5714)   
Resolving deltas: 100% (5714/5714), completed with 576 local objects.
From /pub/scm/linux/kernel/git/x86/linux-2.6-x86
   4b119e2..f194fed  master     -> x86
Checking out files:  28% (1036/3692)   
Checking out files:  29% (1071/3692)   
Checking out files:  30% (1108/3692)   
Checking out files:  31% (1145/3692)   
Checking out files:  32% (1182/3692)   
Checking out files:  33% (1219/3692)   
Checking out files:  34% (1256/3692)   
Checking out files:  35% (1293/3692)   
Checking out files:  36% (1330/3692)   
Checking out files:  37% (1367/3692)   
Checking out files:  38% (1403/3692)   
Checking out files:  39% (1440/3692)   
Checking out files:  39% (1449/3692)   
Checking out files:  40% (1477/3692)   
Checking out files:  41% (1514/3692)   
Checking out files:  42% (1551/3692)   
Checking out files:  43% (1588/3692)   
Checking out files:  44% (1625/3692)   
Checking out files:  44% (1659/3692)   
Checking out files:  45% (1662/3692)   
Checking out files:  46% (1699/3692)   
Checking out files:  47% (1736/3692)   
Checking out files:  48% (1773/3692)   
Checking out files:  49% (1810/3692)   
Checking out files:  50% (1846/3692)   
Checking out files:  51% (1883/3692)   
Checking out files:  52% (1920/3692)   
Checking out files:  53% (1957/3692)   
Checking out files:  54% (1994/3692)   
Checking out files:  55% (2031/3692)   
Checking out files:  56% (2068/3692)   
Checking out files:  57% (2105/3692)   
Checking out files:  57% (2123/3692)   
Checking out files:  58% (2142/3692)   
Checking out files:  59% (2179/3692)   
Checking out files:  60% (2216/3692)   
Checking out files:  61% (2253/3692)   
Checking out files:  62% (2290/3692)   
Checking out files:  62% (2294/3692)   
Checking out files:  63% (2326/3692)   
Checking out files:  64% (2363/3692)   
Checking out files:  65% (2400/3692)   
Checking out files:  66% (2437/3692)   
Checking out files:  67% (2474/3692)   
Checking out files:  68% (2511/3692)   
Checking out files:  69% (2548/3692)   
Checking out files:  70% (2585/3692)   
Checking out files:  70% (2608/3692)   
Checking out files:  71% (2622/3692)   
Checking out files:  72% (2659/3692)   
Checking out files:  73% (2696/3692)   
Checking out files:  74% (2733/3692)   
Checking out files:  75% (2769/3692)   
Checking out files:  76% (2806/3692)   
Checking out files:  77% (2843/3692)   
Checking out files:  78% (2880/3692)   
Checking out files:  79% (2917/3692)   
Checking out files:  79% (2937/3692)   
Checking out files:  80% (2954/3692)   
Checking out files:  81% (2991/3692)   
Checking out files:  82% (3028/3692)   
Checking out files:  83% (3065/3692)   
Checking out files:  84% (3102/3692)   
Checking out files:  85% (3139/3692)   
Checking out files:  86% (3176/3692)   
Checking out files:  87% (3213/3692)   
Checking out files:  88% (3249/3692)   
Checking out files:  89% (3286/3692)   
Checking out files:  90% (3323/3692)   
Checking out files:  91% (3360/3692)   
Checking out files:  92% (3397/3692)   
Checking out files:  93% (3434/3692)   
Checking out files:  94% (3471/3692)   
Checking out files:  95% (3508/3692)   
Checking out files:  96% (3545/3692)   
Checking out files:  97% (3582/3692)   
Checking out files:  97% (3616/3692)   
Checking out files:  98% (3619/3692)   
Checking out files:  99% (3656/3692)   
Checking out files: 100% (3692/3692)   
Checking out files: 100% (3692/3692), done.
Switched to branch "x86"
Finished one revert.
Checking out files:  21% (794/3691)   
Checking out files:  22% (813/3691)   
Checking out files:  23% (849/3691)   
Checking out files:  24% (886/3691)   
Checking out files:  25% (923/3691)   
Checking out files:  26% (960/3691)   
Checking out files:  27% (997/3691)   
Checking out files:  28% (1034/3691)   
Checking out files:  29% (1071/3691)   
Checking out files:  30% (1108/3691)   
Checking out files:  31% (1145/3691)   
Checking out files:  31% (1170/3691)   
Checking out files:  32% (1182/3691)   
Checking out files:  33% (1219/3691)   
Checking out files:  33% (1224/3691)   
Checking out files:  33% (1253/3691)   
Checking out files:  34% (1255/3691)   
Checking out files:  34% (1287/3691)   
Checking out files:  35% (1292/3691)   
Checking out files:  36% (1329/3691)   
Checking out files:  37% (1366/3691)   
Checking out files:  38% (1403/3691)   
Checking out files:  39% (1440/3691)   
Checking out files:  40% (1477/3691)   
Checking out files:  41% (1514/3691)   
Checking out files:  41% (1531/3691)   
Checking out files:  42% (1551/3691)   
Checking out files:  43% (1588/3691)   
Checking out files:  44% (1625/3691)   
Checking out files:  45% (1661/3691)   
Checking out files:  46% (1698/3691)   
Checking out files:  47% (1735/3691)   
Checking out files:  48% (1772/3691)   
Checking out files:  49% (1809/3691)   
Checking out files:  50% (1846/3691)   
Checking out files:  51% (1883/3691)   
Checking out files:  52% (1920/3691)   
Checking out files:  53% (1957/3691)   
Checking out files:  53% (1992/3691)   
Checking out files:  54% (1994/3691)   
Checking out files:  55% (2031/3691)   
Checking out files:  56% (2067/3691)   
Checking out files:  57% (2104/3691)   
Checking out files:  58% (2141/3691)   
Checking out files:  59% (2178/3691)   
Checking out files:  60% (2215/3691)   
Checking out files:  61% (2252/3691)   
Checking out files:  62% (2289/3691)   
Checking out files:  63% (2326/3691)   
Checking out files:  64% (2363/3691)   
Checking out files:  64% (2394/3691)   
Checking out files:  65% (2400/3691)   
Checking out files:  66% (2437/3691)   
Checking out files:  66% (2459/3691)   
Checking out files:  67% (2473/3691)   
Checking out files:  68% (2510/3691)   
Checking out files:  69% (2547/3691)   
Checking out files:  70% (2584/3691)   
Checking out files:  71% (2621/3691)   
Checking out files:  72% (2658/3691)   
Checking out files:  73% (2695/3691)   
Checking out files:  74% (2732/3691)   
Checking out files:  75% (2769/3691)   
Checking out files:  76% (2806/3691)   
Checking out files:  77% (2843/3691)   
Checking out files:  78% (2879/3691)   
Checking out files:  78% (2901/3691)   
Checking out files:  79% (2916/3691)   
Checking out files:  80% (2953/3691)   
Checking out files:  81% (2990/3691)   
Checking out files:  82% (3027/3691)   
Checking out files:  83% (3064/3691)   
Checking out files:  84% (3101/3691)   
Checking out files:  85% (3138/3691)   
Checking out files:  86% (3175/3691)   
Checking out files:  87% (3212/3691)   
Checking out files:  88% (3249/3691)   
Checking out files:  89% (3285/3691)   
Checking out files:  89% (3290/3691)   
Checking out files:  89% (3297/3691)   
Checking out files:  90% (3322/3691)   
Checking out files:  91% (3359/3691)   
Checking out files:  92% (3396/3691)   
Checking out files:  93% (3433/3691)   
Checking out files:  94% (3470/3691)   
Checking out files:  95% (3507/3691)   
Checking out files:  96% (3544/3691)   
Checking out files:  97% (3581/3691)   
Checking out files:  98% (3618/3691)   
Checking out files:  99% (3655/3691)   
Checking out files: 100% (3691/3691)   
Checking out files: 100% (3691/3691), done.
Switched to branch "2.6.25-mc3"
Already on "2.6.25-mc3"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
Already on "2.6.25-mc3"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
fatal: Not a valid object name: '2.6.25-rc8'.
Checking out files:  22% (900/4075)   
Checking out files:  23% (938/4075)   
Checking out files:  24% (978/4075)   
Checking out files:  25% (1019/4075)   
Checking out files:  26% (1060/4075)   
Checking out files:  27% (1101/4075)   
Checking out files:  28% (1141/4075)   
Checking out files:  29% (1182/4075)   
Checking out files:  30% (1223/4075)   
Checking out files:  31% (1264/4075)   
Checking out files:  32% (1304/4075)   
Checking out files:  33% (1345/4075)   
Checking out files:  33% (1374/4075)   
Checking out files:  34% (1386/4075)   
Checking out files:  35% (1427/4075)   
Checking out files:  36% (1467/4075)   
Checking out files:  37% (1508/4075)   
Checking out files:  38% (1549/4075)   
Checking out files:  39% (1590/4075)   
Checking out files:  40% (1630/4075)   
Checking out files:  41% (1671/4075)   
Checking out files:  42% (1712/4075)   
Checking out files:  43% (1753/4075)   
Checking out files:  44% (1793/4075)   
Checking out files:  45% (1834/4075)   
Checking out files:  46% (1875/4075)   
Checking out files:  47% (1916/4075)   
Checking out files:  48% (1956/4075)   
Checking out files:  49% (1997/4075)   
Checking out files:  50% (2038/4075)   
Checking out files:  50% (2072/4075)   
Checking out files:  51% (2079/4075)   
Checking out files:  52% (2119/4075)   
Checking out files:  53% (2160/4075)   
Checking out files:  54% (2201/4075)   
Checking out files:  55% (2242/4075)   
Checking out files:  56% (2282/4075)   
Checking out files:  57% (2323/4075)   
Checking out files:  58% (2364/4075)   
Checking out files:  58% (2399/4075)   
Checking out files:  59% (2405/4075)   
Checking out files:  60% (2445/4075)   
Checking out files:  61% (2486/4075)   
Checking out files:  62% (2527/4075)   
Checking out files:  63% (2568/4075)   
Checking out files:  64% (2608/4075)   
Checking out files:  65% (2649/4075)   
Checking out files:  65% (2683/4075)   
Checking out files:  66% (2690/4075)   
Checking out files:  67% (2731/4075)   
Checking out files:  68% (2771/4075)   
Checking out files:  69% (2812/4075)   
Checking out files:  70% (2853/4075)   
Checking out files:  71% (2894/4075)   
Checking out files:  71% (2902/4075)   
Checking out files:  72% (2934/4075)   
Checking out files:  73% (2975/4075)   
Checking out files:  74% (3016/4075)   
Checking out files:  75% (3057/4075)   
Checking out files:  76% (3097/4075)   
Checking out files:  77% (3138/4075)   
Checking out files:  78% (3179/4075)   
Checking out files:  79% (3220/4075)   
Checking out files:  80% (3260/4075)   
Checking out files:  81% (3301/4075)   
Checking out files:  82% (3342/4075)   
Checking out files:  83% (3383/4075)   
Checking out files:  84% (3423/4075)   
Checking out files:  85% (3464/4075)   
Checking out files:  86% (3505/4075)   
Checking out files:  87% (3546/4075)   
Checking out files:  88% (3586/4075)   
Checking out files:  89% (3627/4075)   
Checking out files:  90% (3668/4075)   
Checking out files:  91% (3709/4075)   
Checking out files:  91% (3744/4075)   
Checking out files:  92% (3749/4075)   
Checking out files:  93% (3790/4075)   
Checking out files:  94% (3831/4075)   
Checking out files:  95% (3872/4075)   
Checking out files:  96% (3912/4075)   
Checking out files:  97% (3953/4075)   
Checking out files:  98% (3994/4075)   
Checking out files:  99% (4035/4075)   
Checking out files: 100% (4075/4075)   
Checking out files: 100% (4075/4075), done.
Switched to branch "doc"
Checking out files:  19% (810/4085)   
Checking out files:  20% (817/4085)   
Checking out files:  21% (858/4085)   
Checking out files:  22% (899/4085)   
Checking out files:  23% (940/4085)   
Checking out files:  24% (981/4085)   
Checking out files:  24% (1011/4085)   
Checking out files:  25% (1022/4085)   
Checking out files:  26% (1063/4085)   
Checking out files:  27% (1103/4085)   
Checking out files:  28% (1144/4085)   
Checking out files:  29% (1185/4085)   
Checking out files:  30% (1226/4085)   
Checking out files:  31% (1267/4085)   
Checking out files:  31% (1301/4085)   
Checking out files:  32% (1308/4085)   
Checking out files:  33% (1349/4085)   
Checking out files:  34% (1389/4085)   
Checking out files:  35% (1430/4085)   
Checking out files:  36% (1471/4085)   
Checking out files:  37% (1512/4085)   
Checking out files:  38% (1553/4085)   
Checking out files:  38% (1574/4085)   
Checking out files:  39% (1594/4085)   
Checking out files:  40% (1634/4085)   
Checking out files:  41% (1675/4085)   
Checking out files:  42% (1716/4085)   
Checking out files:  43% (1757/4085)   
Checking out files:  43% (1782/4085)   
Checking out files:  43% (1790/4085)   
Checking out files:  44% (1798/4085)   
Checking out files:  45% (1839/4085)   
Checking out files:  45% (1842/4085)   
Checking out files:  45% (1864/4085)   
Checking out files:  46% (1880/4085)   
Checking out files:  47% (1920/4085)   
Checking out files:  47% (1938/4085)   
Checking out files:  48% (1961/4085)   
Checking out files:  49% (2002/4085)   
Checking out files:  50% (2043/4085)   
Checking out files:  51% (2084/4085)   
Checking out files:  51% (2107/4085)   
Checking out files:  52% (2125/4085)   
Checking out files:  53% (2166/4085)   
Checking out files:  54% (2206/4085)   
Checking out files:  55% (2247/4085)   
Checking out files:  56% (2288/4085)   
Checking out files:  57% (2329/4085)   
Checking out files:  58% (2370/4085)   
Checking out files:  59% (2411/4085)   
Checking out files:  60% (2451/4085)   
Checking out files:  61% (2492/4085)   
Checking out files:  62% (2533/4085)   
Checking out files:  63% (2574/4085)   
Checking out files:  64% (2615/4085)   
Checking out files:  65% (2656/4085)   
Checking out files:  66% (2697/4085)   
Checking out files:  67% (2737/4085)   
Checking out files:  68% (2778/4085)   
Checking out files:  68% (2803/4085)   
Checking out files:  69% (2819/4085)   
Checking out files:  70% (2860/4085)   
Checking out files:  71% (2901/4085)   
Checking out files:  72% (2942/4085)   
Checking out files:  73% (2983/4085)   
Checking out files:  74% (3023/4085)   
Checking out files:  75% (3064/4085)   
Checking out files:  75% (3103/4085)   
Checking out files:  76% (3105/4085)   
Checking out files:  77% (3146/4085)   
Checking out files:  78% (3187/4085)   
Checking out files:  79% (3228/4085)   
Checking out files:  80% (3268/4085)   
Checking out files:  81% (3309/4085)   
Checking out files:  82% (3350/4085)   
Checking out files:  83% (3391/4085)   
Checking out files:  84% (3432/4085)   
Checking out files:  85% (3473/4085)   
Checking out files:  86% (3514/4085)   
Checking out files:  86% (3542/4085)   
Checking out files:  87% (3554/4085)   
Checking out files:  88% (3595/4085)   
Checking out files:  89% (3636/4085)   
Checking out files:  90% (3677/4085)   
Checking out files:  91% (3718/4085)   
Checking out files:  92% (3759/4085)   
Checking out files:  93% (3800/4085)   
Checking out files:  94% (3840/4085)   
Checking out files:  95% (3881/4085)   
Checking out files:  96% (3922/4085)   
Checking out files:  97% (3963/4085)   
Checking out files:  97% (3989/4085)   
Checking out files:  98% (4004/4085)   
Checking out files:  99% (4045/4085)   
Checking out files: 100% (4085/4085)   
Checking out files: 100% (4085/4085), done.
Switched to branch "2.6.25-mc3"
Already on "2.6.25-mc3"
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
From git://git.infradead.org/~dedekind/ubi-2.6
 + 4172d4c...4b119e2 master     -> ubi  (forced update)
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
Checking out files:  25% (1020/4029)   
Checking out files:  26% (1048/4029)   
Checking out files:  27% (1088/4029)   
Checking out files:  28% (1129/4029)   
Checking out files:  29% (1169/4029)   
Checking out files:  30% (1209/4029)   
Checking out files:  31% (1249/4029)   
Checking out files:  32% (1290/4029)   
Checking out files:  33% (1330/4029)   
Checking out files:  34% (1370/4029)   
Checking out files:  35% (1411/4029)   
Checking out files:  36% (1451/4029)   
Checking out files:  37% (1491/4029)   
Checking out files:  38% (1532/4029)   
Checking out files:  39% (1572/4029)   
Checking out files:  40% (1612/4029)   
Checking out files:  41% (1652/4029)   
Checking out files:  42% (1693/4029)   
Checking out files:  43% (1733/4029)   
Checking out files:  44% (1773/4029)   
Checking out files:  44% (1793/4029)   
Checking out files:  45% (1814/4029)   
Checking out files:  46% (1854/4029)   
Checking out files:  47% (1894/4029)   
Checking out files:  47% (1922/4029)   
Checking out files:  48% (1934/4029)   
Checking out files:  49% (1975/4029)   
Checking out files:  50% (2015/4029)   
Checking out files:  51% (2055/4029)   
Checking out files:  52% (2096/4029)   
Checking out files:  53% (2136/4029)   
Checking out files:  54% (2176/4029)   
Checking out files:  54% (2182/4029)   
Checking out files:  55% (2216/4029)   
Checking out files:  56% (2257/4029)   
Checking out files:  57% (2297/4029)   
Checking out files:  58% (2337/4029)   
Checking out files:  59% (2378/4029)   
Checking out files:  60% (2418/4029)   
Checking out files:  61% (2458/4029)   
Checking out files:  62% (2498/4029)   
Checking out files:  63% (2539/4029)   
Checking out files:  64% (2579/4029)   
Checking out files:  65% (2619/4029)   
Checking out files:  66% (2660/4029)   
Checking out files:  67% (2700/4029)   
Checking out files:  67% (2724/4029)   
Checking out files:  68% (2740/4029)   
Checking out files:  69% (2781/4029)   
Checking out files:  70% (2821/4029)   
Checking out files:  71% (2861/4029)   
Checking out files:  72% (2901/4029)   
Checking out files:  73% (2942/4029)   
Checking out files:  74% (2982/4029)   
Checking out files:  75% (3022/4029)   
Checking out files:  76% (3063/4029)   
Checking out files:  76% (3089/4029)   
Checking out files:  77% (3103/4029)   
Checking out files:  78% (3143/4029)   
Checking out files:  79% (3183/4029)   
Checking out files:  80% (3224/4029)   
Checking out files:  81% (3264/4029)   
Checking out files:  82% (3304/4029)   
Checking out files:  83% (3345/4029)   
Checking out files:  84% (3385/4029)   
Checking out files:  85% (3425/4029)   
Checking out files:  86% (3465/4029)   
Checking out files:  87% (3506/4029)   
Checking out files:  88% (3546/4029)   
Checking out files:  89% (3586/4029)   
Checking out files:  90% (3627/4029)   
Checking out files:  91% (3667/4029)   
Checking out files:  92% (3707/4029)   
Checking out files:  93% (3747/4029)   
Checking out files:  94% (3788/4029)   
Checking out files:  94% (3798/4029)   
Checking out files:  95% (3828/4029)   
Checking out files:  96% (3868/4029)   
Checking out files:  97% (3909/4029)   
Checking out files:  98% (3949/4029)   
Checking out files:  99% (3989/4029)   
Checking out files: 100% (4029/4029)   
Checking out files: 100% (4029/4029), done.
Switched to branch "m68k"
.dotest/patch:353: space before tab in indent.
  			  m68k Macintosh. Support >16bit I/O spaces
.dotest/patch:382: space before tab in indent.
  			  m68k Macintosh. Support >16bit I/O spaces
.dotest/patch:404: trailing whitespace.
 * transfer - some PC's will use the I/O bus, m68k's must use 
.dotest/patch:426: trailing whitespace.
 * transfer - some PC's will use the I/O bus, m68k's must use 
warning: 4 lines add whitespace errors.
.dotest/patch:868: space before tab in indent.
  			break;
.dotest/patch:870: space before tab in indent.
   	} while (--poll_count);
.dotest/patch:875: space before tab in indent.
   	if (!poll_count) {
.dotest/patch:880: space before tab in indent.
   	} else {
.dotest/patch:1631: space before tab in indent.
		   	   shouldn't this be a given if we have it here ? */
warning: squelched 6 whitespace errors
warning: 11 lines add whitespace errors.
Checking out files:   4% (195/4098)   
Checking out files:   5% (205/4098)   
Checking out files:   6% (246/4098)   
Checking out files:   7% (287/4098)   
Checking out files:   8% (328/4098)   
Checking out files:   9% (369/4098)   
Checking out files:  10% (410/4098)   
Checking out files:  11% (451/4098)   
Checking out files:  12% (492/4098)   
Checking out files:  13% (533/4098)   
Checking out files:  14% (574/4098)   
Checking out files:  15% (615/4098)   
Checking out files:  16% (656/4098)   
Checking out files:  17% (697/4098)   
Checking out files:  18% (738/4098)   
Checking out files:  18% (770/4098)   
Checking out files:  19% (779/4098)   
Checking out files:  20% (820/4098)   
Checking out files:  21% (861/4098)   
Checking out files:  22% (902/4098)   
Checking out files:  23% (943/4098)   
Checking out files:  24% (984/4098)   
Checking out files:  25% (1025/4098)   
Checking out files:  26% (1066/4098)   
Checking out files:  27% (1107/4098)   
Checking out files:  28% (1148/4098)   
Checking out files:  29% (1189/4098)   
Checking out files:  30% (1230/4098)   
Checking out files:  31% (1271/4098)   
Checking out files:  32% (1312/4098)   
Checking out files:  33% (1353/4098)   
Checking out files:  33% (1380/4098)   
Checking out files:  34% (1394/4098)   
Checking out files:  35% (1435/4098)   
Checking out files:  36% (1476/4098)   
Checking out files:  37% (1517/4098)   
Checking out files:  38% (1558/4098)   
Checking out files:  39% (1599/4098)   
Checking out files:  40% (1640/4098)   
Checking out files:  41% (1681/4098)   
Checking out files:  42% (1722/4098)   
Checking out files:  43% (1763/4098)   
Checking out files:  44% (1804/4098)   
Checking out files:  45% (1845/4098)   
Checking out files:  45% (1858/4098)   
Checking out files:  46% (1886/4098)   
Checking out files:  46% (1919/4098)   
Checking out files:  47% (1927/4098)   
Checking out files:  47% (1945/4098)   
Checking out files:  48% (1968/4098)   
Checking out files:  49% (2009/4098)   
Checking out files:  50% (2049/4098)   
Checking out files:  51% (2090/4098)   
Checking out files:  52% (2131/4098)   
Checking out files:  53% (2172/4098)   
Checking out files:  54% (2213/4098)   
Checking out files:  55% (2254/4098)   
Checking out files:  56% (2295/4098)   
Checking out files:  57% (2336/4098)   
Checking out files:  58% (2377/4098)   
Checking out files:  59% (2418/4098)   
Checking out files:  60% (2459/4098)   
Checking out files:  60% (2465/4098)   
Checking out files:  61% (2500/4098)   
Checking out files:  62% (2541/4098)   
Checking out files:  63% (2582/4098)   
Checking out files:  64% (2623/4098)   
Checking out files:  65% (2664/4098)   
Checking out files:  66% (2705/4098)   
Checking out files:  67% (2746/4098)   
Checking out files:  67% (2786/4098)   
Checking out files:  68% (2787/4098)   
Checking out files:  69% (2828/4098)   
Checking out files:  70% (2869/4098)   
Checking out files:  71% (2910/4098)   
Checking out files:  72% (2951/4098)   
Checking out files:  73% (2992/4098)   
Checking out files:  74% (3033/4098)   
Checking out files:  75% (3074/4098)   
Checking out files:  76% (3115/4098)   
Checking out files:  77% (3156/4098)   
Checking out files:  78% (3197/4098)   
Checking out files:  79% (3238/4098)   
Checking out files:  80% (3279/4098)   
Checking out files:  81% (3320/4098)   
Checking out files:  82% (3361/4098)   
Checking out files:  83% (3402/4098)   
Checking out files:  84% (3443/4098)   
Checking out files:  85% (3484/4098)   
Checking out files:  86% (3525/4098)   
Checking out files:  87% (3566/4098)   
Checking out files:  88% (3607/4098)   
Checking out files:  88% (3635/4098)   
Checking out files:  89% (3648/4098)   
Checking out files:  90% (3689/4098)   
Checking out files:  91% (3730/4098)   
Checking out files:  92% (3771/4098)   
Checking out files:  92% (3808/4098)   
Checking out files:  93% (3812/4098)   
Checking out files:  94% (3853/4098)   
Checking out files:  95% (3894/4098)   
Checking out files:  96% (3935/4098)   
Checking out files:  97% (3976/4098)   
Checking out files:  98% (4017/4098)   
Checking out files:  98% (4049/4098)   
Checking out files:  99% (4058/4098)   
Checking out files: 100% (4098/4098)   
Checking out files: 100% (4098/4098), done.
Switched to branch "2.6.25-mc3"
Already on "2.6.25-mc3"
warning: too many files, skipping inexact rename detection
Already on "2.6.25-mc3"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
remote: Counting objects: 284, done.
remote: Compressing objects:   2% (1/43)   
remote: Compressing objects:   4% (2/43)   
remote: Compressing objects:   6% (3/43)   
remote: Compressing objects:remote:    9% (4/43)   
remote: Compressing objects:  11% (5/43)   
remote: Compressing objects:  13% (6/43)   
remote: Compressing objects:  16% (7/43)   
remote: Compremote: ressing objects:  18% (8/43)   
remote: Compressing objects:  20% (9/43)   
remote: Compressing objects:  23% (10/43)   
remote: Compressing objects:  2remote: 5% (11/43)   
remote: Compressing objects:  27% (12/43)   
remote: Compressing objects:  30% (13/43)   
remote: Compressing objects:  32% (14/43)   
remote: Comremote: pressing objects:  34% (15/43)   
remote: Compressing objects:  37% (16/43)   
remote: Compressing objects:  39% (17/43)   
remote: Compressing objects:remote:   41% (18/43)   
remote: Compressing objects:  44% (19/43)   
remote: Compressing objects:  46% (20/43)   
remote: Compressing objects:  48% (21/43)   
remote: Compressing objects:  51% (22/43)   
remote: Compressing objects:  53% (23/43)   
remote: Compressing objects:  55% (24/43)   
remote: Compressing objecremote: ts:  58% (25/43)   
remote: Compressing objects:  60% (26/43)   
remote: Compressing objects:  62% (27/43)   
remote: Compressing objects:  65% (28/43) remote:   
remote: Compressing objects:  67% (29/43)   
remote: Compressing objects:  69% (30/43)   
remote: Compressing objects:  72% (31/43)   
remote: Compressing obremote: jects:  74% (32/43)   
remote: Compressing objects:  76% (33/43)   
remote: Compressing objects:  79% (34/43)   
remote: Compressing objects:  81% (35/4remote: 3)   
remote: Compressing objects:  83% (36/43)   
remote: Compressing objects:  86% (37/43)   
remote: Compressing objects:  88% (38/43)   
remote: Compressingremote:  objects:  90% (39/43)   
remote: Compressing objects:  93% (40/43)   
remote: Compressing objects:  95% (41/43)   
remote: Compressing objects:  97% (4remote: 2/43)   
remote: Compressing objects: 100% (43/43)   
remote: Compressing objects: 100% (43/43), done.
remote: Total 255 (delta 213), reused 254 (delta remote: 212)
Receiving objects:   0% (1/255)   
Receiving objects:   1% (3/255)   
Receiving objects:   2% (6/255)   
Receiving objects:   3% (8/255)   
Receiving objects:   4% (11/255)   
Receiving objects:   5% (13/255)   
Receiving objects:   6% (16/255)   
Receiving objects:   7% (18/255)   
Receiving objects:   8% (21/255)   
Receiving objects:   9% (23/255)   
Receiving objects:  10% (26/255)   
Receiving objects:  11% (29/255)   
Receiving objects:  12% (31/255)   
Receiving objects:  13% (34/255)   
Receiving objects:  14% (36/255)   
Receiving objects:  15% (39/255)   
Receiving objects:  16% (41/255)   
Receiving objects:  17% (44/255)   
Receiving objects:  18% (46/255)   
Receiving objects:  19% (49/255)   
Receiving objects:  20% (51/255)   
Receiving objects:  21% (54/255)   
Receiving objects:  22% (57/255)   
Receiving objects:  23% (59/255)   
Receiving objects:  24% (62/255)   
Receiving objects:  25% (64/255)   
Receiving objects:  26% (67/255)   
Receiving objects:  27% (69/255)   
Receiving objects:  28% (72/255)   
Receiving objects:  29% (74/255)   
Receiving objects:  30% (77/255)   
Receiving objects:  31% (80/255)   
Receiving objects:  32% (82/255)   
Receiving objects:  33% (85/255)   
Receiving objects:  34% (87/255)   
Receiving objects:  35% (90/255)   
Receiving objects:  36% (92/255)   
Receiving objects:  37% (95/255)   
Receiving objects:  38% (97/255)   
Receiving objects:  39% (100/255)   
Receiving objects:  40% (102/255)   
Receiving objects:  41% (105/255)   
Receiving objects:  42% (108/255)   
Receiving objects:  43% (110/255)   
Receiving objects:  44% (113/255)   
Receiving objects:  45% (115/255)   
Receiving objects:  46% (118/255)   
Receiving objects:  47% (120/255)   
Receiving objects:  48% (123/255)   
Receiving objects:  49% (125/255)   
Receiving objects:  50% (128/255)   
Receiving objects:  51% (131/255)   
Receiving objects:  52% (133/255)   
Receiving objects:  53% (136/255)   
Receiving objects:  54% (138/255)   
Receiving objects:  55% (141/255)   
Receiving objects:  56% (143/255)   
Receiving objects:  57% (146/255)   
Receiving objects:  58% (148/255)   
Receiving objects:  59% (151/255)   
Receiving objects:  60% (153/255)   
Receiving objects:  61% (156/255)   
Receiving objects:  62% (159/255)   
Receiving objects:  63% (161/255)   
Receiving objects:  64% (164/255)   
Receiving objects:  65% (166/255)   
Receiving objects:  66% (169/255)   
Receiving objects:  67% (171/255)   
Receiving objects:  68% (174/255)   
Receiving objects:  69% (176/255)   
Receiving objects:  70% (179/255)   
Receiving objects:  71% (182/255)   
Receiving objects:  72% (184/255)   
Receiving objects:  73% (187/255)   
Receiving objects:  74% (189/255)   
Receiving objects:  75% (192/255)   
Receiving objects:  76% (194/255)   
Receiving objects:  77% (197/255)   
Receiving objects:  78% (199/255)   
Receiving objects:  79% (202/255)   
Receiving objects:  80% (204/255)   
Receiving objects:  81% (207/255)   
Receiving objects:  82% (210/255)   
Receiving objects:  83% (212/255)   
Receiving objects:  84% (215/255)   
Receiving objects:  85% (217/255)   
Receiving objects:  86% (220/255)   
Receiving objects:  87% (222/255)   
Receiving objects:  88% (225/255)   
Receiving objects:  89% (227/255)   
Receiving objects:  90% (230/255)   
Receiving objects:  91% (233/255)   
Receiving objects:  92% (235/255)   
Receiving objects:  93% (238/255)   
Receiving objects:  94% (240/255)   
Receiving objects:  95% (243/255)   
Receiving objects:  96% (245/255)   
Receiving objects:  97% (248/255)   
Receiving objects:  98% (250/255)   
Receiving objects:  99% (253/255)   
Receiving objects: 100% (255/255)   
Receiving objects: 100% (255/255), 44.16 KiB, done.
Resolving deltas:   0% (1/213)   
Resolving deltas:  18% (39/213)   
Resolving deltas:  19% (41/213)   
Resolving deltas:  38% (82/213)   
Resolving deltas:  57% (123/213)   
Resolving deltas:  58% (124/213)   
Resolving deltas:  59% (126/213)   
Resolving deltas:  60% (128/213)   
Resolving deltas:  61% (131/213)   
Resolving deltas:  62% (133/213)   
Resolving deltas:  67% (143/213)   
Resolving deltas:  69% (147/213)   
Resolving deltas:  70% (151/213)   
Resolving deltas:  72% (155/213)   
Resolving deltas:  85% (182/213)   
Resolving deltas:  87% (186/213)   
Resolving deltas:  88% (189/213)   
Resolving deltas:  93% (199/213)   
Resolving deltas:  94% (202/213)   
Resolving deltas:  97% (207/213)   
Resolving deltas:  98% (209/213)   
Resolving deltas:  99% (211/213)   
Resolving deltas: 100% (213/213)   
Resolving deltas: 100% (213/213), completed with 27 local objects.
From /pub/scm/linux/kernel/git/jack/linux-udf-2.6
 + ff26f53...f845fce for_next   -> udf  (forced update)
warning: too many files, skipping inexact rename detection
Already on "2.6.25-mc3"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
remote: Counting objects: 1   
remote: Counting objects: 402, done.
remote: Compressing objects:   0% (1/139)   
remote: Compressing objects:   1% (2/139)   
remote: Compressing objects:   2% (3/139)   
remote: Compressing objects:   3% (5/139)   
remote: Compressing objects:   4% (6/139)   
remote: Compressing objects:   5% (7/139)   
remote: Compressing objects:   6% (9/139)   
remote: Compressing objects:   7% (10/139)   
remote: Compressing objects:   8% (12/139)   
remote: Compressing objects:   9% (13/139)   
remote: Compressing obremote: jects:  10% (14/139)   
remote: Compressing objects:  11% (16/139)   
remote: Compressing objects:  12% (17/139)   
remote: Compressing objects:  13% (19/139)   
remote: Compressing objects:  14% (20/139)   
remote: Compressing objects:  15% (21/139)   
remote: Compressing objects:  16% (23/139)   
remote: Compressing objects:  17% (24/139)   
remote: Compressing objects:  18% (26/139)   
remote: Compressing objects:  19% (27/139)   
remote: Compressing objects:  20% (28/139)   
remote: Compressing objects:  21% (30/139)   
remote: Compressing objects:  22% (31/139)   
remote: Compressing objects:  23% (32/139)   
remote: Compressing objects:  24% (34/139)   
remote: Compressing objects:  25% (35/139)   
remote: Compressing objects:  26% (37/139)   
remote: Compressing objects:  27% (38/139)   
remote: Compressing objects:  28% (39/139)   
remote: Compressing objects:  29% (41/139)   
remote: Compressing objects:  30% (42/139)   
remote: Compressing objects:  31% (44/139)   
remote: Compressing objects:  32% (45/139)   
remote: Compressing objects:  33% (46/139)   
remote: Compressing objects:  34% (48/139)   
remote: Compressing objects:  35% (49/139)   
remote: Compressing objects:  36% (51/139)   
remote: Compressing objects:  37% (52/139)   
remote: Compressing objects:  38% (53/139)   
remote: Compressing objects:  39% (55/139)   
remote: Compressing objects:  40% (56/139)   
remote: Compressing objects:  41% (57/139)   
remote: Compressing objects:  42% (59/139)   
remote: Compressing objects:  43% (60/139)   
remote: Compressing objects:  44% (62/139)   
remote: Compressing objects:  45% (63/139)   
remote: Compressing objects:  46% (64/139)   
remote: Compressing objects:  47% (66/139)   
remote: Compressing objects:  48% (67/139)   
remote: Compressing objects:  49% (69/139)   
remote: Compressing objects:  50% (70/139)   
remote: Compressing objects:  51% (71/139)   
remote: Compressing objects:  52% (73/139)   
remote: Compressing objects:  53% (74/139)   
remote: Compressing objects:  54% (76/139)   
remote: Compressing objects:  55% (77/139)   
remote: Compressing objects:  56% (78/139)   
remote: Compressing objects:  57% (80/139)   
remote: Compressing objects:  58% (81/139)   
remote: Compressing objects:  59% (83/139)   
remote: Compressing objects:  60% (84/139)   
remote: Compressing objects:  61% (85/139)   
remote: Compressing objects:  62% (87/139)   
remote: Compressing objects:  63% (88/139)   
remote: Compressing objects:  64% (89/139)   
remote: Compressing objects:  65% (91/139)   
remote: Compressing objects:  66% (92/139)   
remote: Compressing objects:  67% (94/139)   
remote: Compressing objects:  68% (95/139)   
remote: Compressing objects:  69% (96/139)   
remote: Compressing objects:  70% (98/139)   
remote: Compressing objects:  71% (99/139)   
remote: Compressing objects:  72% (101/139)   
remote: Compressing objects:  73% (102/139)   
remote: Compressing objects:  74% (103/139)   
remote: Compressing objects:  75% (105/139)   
remote: Compressing objects:  76% (106/139)   
remote: Compressing objects:  77% (108/139)   
remote: Compressing objects:  78% (109/139)   
remote: Compressing objects:  79% (110/139)   
remote: Compressing objects:  80% (112/139)   
remote: Compressing objects:  81% (113/139)   
remote: Compressing objects:  82% (114/139)   
remote: Compressing objects:  83% (116/139)   
remote: Compressing objects:  84% (117/139)   
remote: Compressing objects:  85% (119/139)   
remote: Compressing objects:  86% (120/139)   
remote: Compressing objects:  87% (121/139)   
remote: Compressing objects:  88% (123/139)   
remote: Compressing objects:  89% (124/139)   
remote: Compressing objects:  90% (126/139)   
remote: Compressing objects:  91% (127/139)   
remote: Compressing objects:  92% (128/139)   
remote: Compressing objects:  93% (130/139)   
remote: Compressing objects:  94% (131/139)   
remote: Compressing objects:  95% (133/139)   
remote: Compressing objects:  96% (134/139)   
remote: Compressing objects:  97% (135/139)   
remote: Compressing objects:  98% (137/139)   
remote: Compressing objects:  99% (138/139)   
remote: Compressing objects: 100% (139/139)   
remote: Compressing objects: 100% (139/139), done.
remote: Total 306 (delta 263), reused 202 (delta 167)
Receiving objects:   0% (1/306)   
Receiving objects:   1% (4/306)   
Receiving objects:   2% (7/306)   
Receiving objects:   3% (10/306)   
Receiving objects:   4% (13/306)   
Receiving objects:   5% (16/306)   
Receiving objects:   6% (19/306)   
Receiving objects:   7% (22/306)   
Receiving objects:   8% (25/306)   
Receiving objects:   9% (28/306)   
Receiving objects:  10% (31/306)   
Receiving objects:  11% (34/306)   
Receiving objects:  12% (37/306)   
Receiving objects:  13% (40/306)   
Receiving objects:  14% (43/306)   
Receiving objects:  15% (46/306)   
Receiving objects:  16% (49/306)   
Receiving objects:  17% (53/306)   
Receiving objects:  18% (56/306)   
Receiving objects:  19% (59/306)   
Receiving objects:  20% (62/306)   
Receiving objects:  21% (65/306)   
Receiving objects:  22% (68/306)   
Receiving objects:  23% (71/306)   
Receiving objects:  24% (74/306)   
Receiving objects:  25% (77/306)   
Receiving objects:  26% (80/306)   
Receiving objects:  27% (83/306)   
Receiving objects:  28% (86/306)   
Receiving objects:  29% (89/306)   
Receiving objects:  30% (92/306)   
Receiving objects:  31% (95/306)   
Receiving objects:  32% (98/306)   
Receiving objects:  33% (101/306)   
Receiving objects:  34% (105/306)   
Receiving objects:  35% (108/306)   
Receiving objects:  36% (111/306)   
Receiving objects:  37% (114/306)   
Receiving objects:  38% (117/306)   
Receiving objects:  39% (120/306)   
Receiving objects:  40% (123/306)   
Receiving objects:  41% (126/306)   
Receiving objects:  42% (129/306)   
Receiving objects:  43% (132/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  44% (135/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  45% (138/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  46% (141/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  47% (144/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  48% (147/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  49% (150/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  50% (153/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  51% (157/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  52% (160/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  53% (163/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  54% (166/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  55% (169/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  56% (172/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  57% (175/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  58% (178/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  59% (181/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  60% (184/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  61% (187/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  62% (190/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  63% (193/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  64% (196/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  65% (199/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  66% (202/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  67% (206/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  68% (209/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  69% (212/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  70% (215/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  71% (218/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  72% (221/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  73% (224/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  74% (227/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  75% (230/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  76% (233/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  77% (236/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  78% (239/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  79% (242/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  80% (245/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  81% (248/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  82% (251/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  83% (254/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  84% (258/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  85% (261/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  86% (264/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  87% (267/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  88% (270/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  89% (273/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  90% (276/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  91% (279/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  92% (282/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  93% (285/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  94% (288/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  95% (291/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  96% (294/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  97% (297/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  98% (300/306), 88.01 KiB | 146 KiB/s   
Receiving objects:  99% (303/306), 88.01 KiB | 146 KiB/s   
Receiving objects: 100% (306/306), 88.01 KiB | 146 KiB/s   
Receiving objects: 100% (306/306), 99.68 KiB | 146 KiB/s, done.
Resolving deltas:  11% (30/263)   
Resolving deltas:  12% (32/263)   
Resolving deltas:  13% (35/263)   
Resolving deltas:  26% (70/263)   
Resolving deltas:  27% (72/263)   
Resolving deltas:  39% (104/263)   
Resolving deltas:  40% (106/263)   
Resolving deltas:  44% (118/263)   
Resolving deltas:  45% (120/263)   
Resolving deltas:  46% (121/263)   
Resolving deltas:  49% (131/263)   
Resolving deltas:  50% (132/263)   
Resolving deltas:  51% (135/263)   
Resolving deltas:  52% (137/263)   
Resolving deltas:  53% (140/263)   
Resolving deltas:  57% (152/263)   
Resolving deltas:  58% (153/263)   
Resolving deltas:  59% (156/263)   
Resolving deltas:  60% (158/263)   
Resolving deltas:  61% (161/263)   
Resolving deltas:  63% (166/263)   
Resolving deltas:  64% (170/263)   
Resolving deltas:  65% (172/263)   
Resolving deltas:  66% (174/263)   
Resolving deltas:  67% (177/263)   
Resolving deltas:  70% (186/263)   
Resolving deltas:  71% (187/263)   
Resolving deltas:  72% (190/263)   
Resolving deltas:  73% (192/263)   
Resolving deltas:  74% (196/263)   
Resolving deltas:  75% (198/263)   
Resolving deltas:  76% (200/263)   
Resolving deltas:  77% (203/263)   
Resolving deltas:  78% (206/263)   
Resolving deltas:  79% (208/263)   
Resolving deltas:  81% (215/263)   
Resolving deltas:  82% (216/263)   
Resolving deltas:  83% (219/263)   
Resolving deltas:  84% (222/263)   
Resolving deltas:  85% (226/263)   
Resolving deltas:  86% (228/263)   
Resolving deltas:  87% (229/263)   
Resolving deltas:  88% (232/263)   
Resolving deltas:  89% (235/263)   
Resolving deltas:  90% (237/263)   
Resolving deltas:  91% (240/263)   
Resolving deltas:  91% (241/263)   
Resolving deltas:  92% (242/263)   
Resolving deltas:  95% (250/263)   
Resolving deltas:  97% (256/263)   
Resolving deltas:  98% (258/263)   
Resolving deltas:  99% (261/263)   
Resolving deltas: 100% (263/263)   
Resolving deltas: 100% (263/263), completed with 85 local objects.
From /pub/scm/linux/kernel/git/galak/powerpc
 + c7cf683...1a9ebc0 powerpc-next -> powerpc1git  (forced update)
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
ivers/usb/core/inode.c                      |    4 +-
 drivers/usb/core/message.c                    |   17 +-
 drivers/usb/core/quirks.c                     |   14 +
 drivers/usb/core/sysfs.c                      |   22 +-
 drivers/usb/core/urb.c                        |   26 +-
 drivers/usb/core/usb.h                        |    2 -
 drivers/usb/gadget/Kconfig                    |   18 +-
 drivers/usb/gadget/amd5536udc.c               |   10 +
 drivers/usb/gadget/at91_udc.c                 |    9 +-
 drivers/usb/gadget/dummy_hcd.c                |   98 +-
 drivers/usb/gadget/epautoconf.c               |   12 +-
 drivers/usb/gadget/ether.c                    |   18 +-
 drivers/usb/gadget/file_storage.c             |   36 +-
 drivers/usb/gadget/fsl_usb2_udc.c             |    4 +-
 drivers/usb/gadget/fsl_usb2_udc.h             |    2 +-
 drivers/usb/gadget/gmidi.c                    |    2 +-
 drivers/usb/gadget/goku_udc.c                 |   20 +-
 drivers/usb/gadget/inode.c                    |   18 +-
 drivers/usb/gadget/lh7a40x_udc.c              |  132 +-
 drivers/usb/gadget/m66592-udc.h               |    2 +-
 drivers/usb/gadget/net2280.h                  |    2 +-
 drivers/usb/gadget/omap_udc.c                 |   20 +-
 drivers/usb/gadget/printer.c                  |   92 +-
 drivers/usb/gadget/pxa2xx_udc.c               |   26 +-
 drivers/usb/gadget/rndis.c                    |  148 +-
 drivers/usb/gadget/serial.c                   |    3 +-
 drivers/usb/host/Kconfig                      |   10 +-
 drivers/usb/host/ehci-au1xxx.c                |    5 +-
 drivers/usb/host/ehci-dbg.c                   |    4 +-
 drivers/usb/host/ehci-fsl.c                   |    9 +-
 drivers/usb/host/ehci-hcd.c                   |  113 +-
 drivers/usb/host/ehci-hub.c                   |   34 +-
 drivers/usb/host/ehci-ixp4xx.c                |    3 +-
 drivers/usb/host/ehci-pci.c                   |    8 +-
 drivers/usb/host/ehci-ppc-soc.c               |    5 +-
 drivers/usb/host/ehci-ps3.c                   |    1 -
 drivers/usb/host/ehci-q.c                     |  104 +-
 drivers/usb/host/ehci-sched.c                 |   46 +-
 drivers/usb/host/isp116x-hcd.c                |   14 +-
 drivers/usb/host/ohci-at91.c                  |    2 +-
 drivers/usb/host/ohci-au1xxx.c                |    1 -
 drivers/usb/host/ohci-dbg.c                   |    2 +-
 drivers/usb/host/ohci-ep93xx.c                |    5 +-
 drivers/usb/host/ohci-hub.c                   |  128 +-
 drivers/usb/host/ohci-lh7a404.c               |    1 -
 drivers/usb/host/ohci-omap.c                  |    8 +-
 drivers/usb/host/ohci-pci.c                   |   47 +-
 drivers/usb/host/ohci-pnx4008.c               |    1 -
 drivers/usb/host/ohci-pnx8550.c               |    1 -
 drivers/usb/host/ohci-ppc-of.c                |    1 -
 drivers/usb/host/ohci-ppc-soc.c               |    1 -
 drivers/usb/host/ohci-ps3.c                   |    2 -
 drivers/usb/host/ohci-pxa27x.c                |    6 +-
 drivers/usb/host/ohci-s3c2410.c               |    1 -
 drivers/usb/host/ohci-sa1111.c                |    1 -
 drivers/usb/host/ohci-sh.c                    |    1 -
 drivers/usb/host/ohci-sm501.c                 |   16 +-
 drivers/usb/host/ohci-ssb.c                   |   37 +-
 drivers/usb/host/pci-quirks.c                 |    6 +-
 drivers/usb/host/r8a66597-hcd.c               |  256 +-
 drivers/usb/host/r8a66597.h                   |   51 +-
 drivers/usb/host/sl811-hcd.c                  |   12 +-
 drivers/usb/host/u132-hcd.c                   | 5124 ++++++++++++-------------
 drivers/usb/host/uhci-hcd.c                   |   35 +-
 drivers/usb/host/uhci-q.c                     |    2 +-
 drivers/usb/image/Kconfig                     |    4 +-
 drivers/usb/image/microtek.c                  |    3 +-
 drivers/usb/image/microtek.h                  |    1 -
 drivers/usb/misc/Kconfig                      |   20 +-
 drivers/usb/misc/adutux.c                     |  120 +-
 drivers/usb/misc/appledisplay.c               |    6 +-
 drivers/usb/misc/auerswald.c                  |  135 +-
 drivers/usb/misc/emi26.c                      |   30 +-
 drivers/usb/misc/emi62.c                      |   32 +-
 drivers/usb/misc/ftdi-elan.c                  |    2 +-
 drivers/usb/misc/iowarrior.c                  |   10 +-
 drivers/usb/misc/ldusb.c                      |   10 +-
 drivers/usb/misc/legousbtower.c               |   92 +-
 drivers/usb/misc/phidgetkit.c                 |    6 +-
 drivers/usb/misc/phidgetmotorcontrol.c        |    2 +-
 drivers/usb/misc/phidgetservo.c               |    6 +-
 drivers/usb/misc/usblcd.c                     |    8 +-
 drivers/usb/misc/usbtest.c                    |   13 +-
 drivers/usb/mon/Makefile                      |    2 +-
 drivers/usb/mon/mon_bin.c                     |    9 +-
 drivers/usb/mon/mon_main.c                    |    3 +-
 drivers/usb/mon/mon_stat.c                    |    3 +
 drivers/usb/serial/Kconfig                    |   76 +-
 drivers/usb/serial/Makefile                   |    3 +-
 drivers/usb/serial/aircable.c                 |   52 +-
 drivers/usb/serial/airprime.c                 |   37 +-
 drivers/usb/serial/ark3116.c                  |   10 +-
 drivers/usb/serial/belkin_sa.c                |   23 +-
 drivers/usb/serial/ch341.c                    |    3 -
 drivers/usb/serial/console.c                  |   10 +-
 drivers/usb/serial/cp2101.c                   |  114 +-
 drivers/usb/serial/cyberjack.c                |  112 +-
 drivers/usb/serial/cypress_m8.c               |  579 ++--
 drivers/usb/serial/digi_acceleport.c          |   50 +-
 drivers/usb/serial/empeg.c                    |   59 +-
 drivers/usb/serial/ezusb.c                    |    8 +-
 drivers/usb/serial/ftdi_sio.c                 |  171 +-
 drivers/usb/serial/funsoft.c                  |    3 -
 drivers/usb/serial/garmin_gps.c               |  115 +-
 drivers/usb/serial/generic.c                  |   56 +-
 drivers/usb/serial/hp4x.c                     |    3 -
 drivers/usb/serial/io_edgeport.c              |  326 +-
 drivers/usb/serial/io_ti.c                    |  398 +-
 drivers/usb/serial/ipaq.c                     |   53 +-
 drivers/usb/serial/ipw.c                      |   51 +-
 drivers/usb/serial/ir-usb.c                   |   53 +-
 drivers/usb/serial/iuu_phoenix.c              |  165 +-
 drivers/usb/serial/keyspan.c                  |  281 +-
 drivers/usb/serial/keyspan_pda.c              |   42 +-
 drivers/usb/serial/kl5kusb105.c               |  124 +-
 drivers/usb/serial/kobil_sct.c                |   75 +-
 drivers/usb/serial/mct_u232.c                 |   41 +-
 drivers/usb/serial/mos7720.c                  |  122 +-
 drivers/usb/serial/mos7840.c                  |  164 +-
 drivers/usb/serial/navman.c                   |   31 +-
 drivers/usb/serial/omninet.c                  |   42 +-
 drivers/usb/serial/option.c                   |   92 +-
 drivers/usb/serial/oti6858.c                  |  121 +-
 drivers/usb/serial/pl2303.c                   |  117 +-
 drivers/usb/serial/safe_serial.c              |   60 +-
 drivers/usb/serial/sierra.c                   |  128 +-
 drivers/usb/serial/spcp8x5.c                  | 1072 ++++++
 drivers/usb/serial/ti_usb_3410_5052.c         |  211 +-
 drivers/usb/serial/usb-serial.c               |  107 +-
 drivers/usb/serial/usb_debug.c                |    3 -
 drivers/usb/serial/visor.c                    |  103 +-
 drivers/usb/serial/whiteheat.c                |  118 +-
 drivers/usb/storage/Kconfig                   |   39 +-
 drivers/usb/storage/Makefile                  |    1 +
 drivers/usb/storage/cypress_atacb.c           |  200 +
 drivers/usb/storage/cypress_atacb.h           |   25 +
 drivers/usb/storage/libusual.c                |   14 +-
 drivers/usb/storage/scsiglue.c                |   26 +-
 drivers/usb/storage/transport.c               |   23 +-
 drivers/usb/storage/unusual_devs.h            |    8 +
 drivers/usb/storage/usb.c                     |   26 +-
 drivers/usb/usb-skeleton.c                    |    8 +-
 include/linux/bitmap.h                        |    1 +
 include/linux/usb.h                           |  199 +-
 include/linux/usb/audio.h                     |    2 +-
 include/linux/usb/cdc.h                       |    4 +
 include/linux/usb/ch9.h                       |   17 +-
 include/linux/usb/g_printer.h                 |    4 +
 include/linux/usb/gadget.h                    |    2 +-
 include/linux/usb/gadgetfs.h                  |   16 +-
 include/linux/usb/input.h                     |    8 +-
 include/linux/usb/iowarrior.h                 |    6 +-
 include/linux/usb/isp116x.h                   |    6 +-
 include/linux/usb/midi.h                      |    2 +-
 include/linux/usb/net2280.h                   |    9 +-
 include/linux/usb/otg.h                       |    6 +-
 include/linux/usb/quirks.h                    |    5 +
 include/linux/usb/rndis_host.h                |    9 +-
 include/linux/usb/serial.h                    |   21 +-
 include/linux/usb/sl811.h                     |    5 +-
 include/linux/usb/usbnet.h                    |    8 +-
 include/linux/usb/wusb-wa.h                   |  284 ++
 include/linux/usb/wusb.h                      |  420 ++
 include/linux/usb_usual.h                     |    1 +
 include/linux/uwb.h                           |  770 ++++
 include/linux/uwb/bugs-macros.h               |   64 +
 include/linux/uwb/bugs.h                      |   41 +
 include/linux/uwb/debug-cmd.h                 |   57 +
 include/linux/uwb/debug.h                     |   82 +
 include/linux/uwb/spec.h                      |  650 ++++
 include/linux/uwb/umc.h                       |  194 +
 include/linux/uwb/util.h                      |   89 +
 include/linux/uwb/whci.h                      |  117 +
 include/linux/wlp.h                           |  728 ++++
 lib/bitmap.c                                  |   20 +
 scripts/checkpatch.pl                         |    7 +
 199 files changed, 12359 insertions(+), 6513 deletions(-)
 create mode 100644 Documentation/usb/WUSB-Design-overview.txt
 create mode 100644 Documentation/usb/anchors.txt
 create mode 100644 Documentation/usb/callbacks.txt
 create mode 100644 Documentation/usb/wusb-cbaf
 create mode 100644 drivers/usb/serial/spcp8x5.c
 create mode 100644 drivers/usb/storage/cypress_atacb.c
 create mode 100644 drivers/usb/storage/cypress_atacb.h
 create mode 100644 include/linux/usb/wusb-wa.h
 create mode 100644 include/linux/usb/wusb.h
 create mode 100644 include/linux/uwb.h
 create mode 100644 include/linux/uwb/bugs-macros.h
 create mode 100644 include/linux/uwb/bugs.h
 create mode 100644 include/linux/uwb/debug-cmd.h
 create mode 100644 include/linux/uwb/debug.h
 create mode 100644 include/linux/uwb/spec.h
 create mode 100644 include/linux/uwb/umc.h
 create mode 100644 include/linux/uwb/util.h
 create mode 100644 include/linux/uwb/whci.h
 create mode 100644 include/linux/wlp.h
##
# quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-ldp/.	gregkh-ldp	base	gregkh-usb
##
building file list ... done
./
README
add-me4000-pci-data-collection-driver.patch
aectc-add-the-aectc-driver.patch
dvb-add-firesat-driver.patch
input-add-appleir-driver.patch
net-add-alacritech-slicoss-driver.patch
net-add-et131x-driver.patch
novfs-add-the-novell-filesystem-client-kernel-module.patch
series
usb-add-option-hso-driver.patch
usb-add-sensoray-2255-v4l-driver.patch
video-add-the-go7007-driver.patch
wusb-add-hwa-hc-wireless-host-controller-driver.patch
wusb-add-hwa-rc-radio-controller-driver.patch
wusb-add-the-i1480-driver.patch
wusb-add-the-usb-wireless-core-code.patch
wusb-add-the-usb-wireless-core-host-controller-helper-driver.patch
wusb-add-the-usb-wusb-cbaf-driver.patch
wusb-add-the-wireless-usb-stack-to-linux.patch
wusb-add-uwb-core-for-wimedia-link-protocol.patch
wusb-add-whc-rc-radio-control-driver.patch

sent 8946777 bytes  received 488 bytes  5964843.33 bytes/sec
total size is 8943395  speedup is 1.00
Using base gregkh-usb
wusb-add-the-wireless-usb-stack-to-linux.patch
wusb-add-whc-rc-radio-control-driver.patch
wusb-add-hwa-rc-radio-controller-driver.patch
wusb-add-uwb-core-for-wimedia-link-protocol.patch
wusb-add-the-i1480-driver.patch
wusb-add-the-usb-wireless-core-code.patch
wusb-add-the-usb-wusb-cbaf-driver.patch
wusb-add-the-usb-wireless-core-host-controller-helper-driver.patch
wusb-add-hwa-hc-wireless-host-controller-driver.patch
usb-add-sensoray-2255-v4l-driver.patch
dvb-add-firesat-driver.patch
usb-add-option-hso-driver.patch
video-add-the-go7007-driver.patch
net-add-alacritech-slicoss-driver.patch
input-add-appleir-driver.patch
add-me4000-pci-data-collection-driver.patch
novfs-add-the-novell-filesystem-client-kernel-module.patch
aectc-add-the-aectc-driver.patch
##
# git /pub/scm/linux/kernel/git/airlied/agp-2.6.git	agp-patches	agp
##
BRANCH agp-patches not in tree /pub/scm/linux/kernel/git/airlied/agp-2.6.git, SKIPPING
##
# git /pub/scm/linux/kernel/git/perex/alsa.git		linus		alsa
##
Merge made by recursive.
 Documentation/sound/alsa/ALSA-Configuration.txt |    1 +
 sound/core/oss/mixer_oss.c                      |    2 +
 sound/pci/hda/hda_codec.c                       |   59 ++++++++++-
 sound/pci/hda/hda_codec.h                       |   12 ++-
 sound/pci/hda/hda_intel.c                       |   89 ++++++++-------
 sound/pci/hda/patch_analog.c                    |    1 +
 sound/pci/hda/patch_atihdmi.c                   |    6 +
 sound/pci/hda/patch_cmedia.c                    |    1 +
 sound/pci/hda/patch_conexant.c                  |    1 +
 sound/pci/hda/patch_realtek.c                   |  130 ++++++++++++++--------
 sound/pci/hda/patch_si3054.c                    |    2 +-
 sound/pci/hda/patch_sigmatel.c                  |    1 +
 sound/pci/hda/patch_via.c                       |    1 +
 sound/pci/ice1712/hoontech.c                    |   21 +++-
 sound/pci/ice1712/revo.c                        |   51 +++++-----
 sound/pci/intel8x0.c                            |    6 +
 sound/usb/caiaq/caiaq-control.c                 |    4 +-
 17 files changed, 264 insertions(+), 124 deletions(-)
##
# git /pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git	avr32-arch	avr32
##
Auto-merged arch/avr32/Kconfig
Removed arch/avr32/mach-at32ap/time-tc.c
Auto-merged drivers/usb/gadget/Kconfig
Auto-merged drivers/usb/gadget/atmel_usba_udc.c
Removed include/asm-avr32/arch-at32ap/time.h
Removed include/asm-avr32/intc.h
Merge made by recursive.
 arch/avr32/Kconfig                     |    5 +
 arch/avr32/kernel/entry-avr32b.S       |   20 --
 arch/avr32/kernel/process.c            |    4 +-
 arch/avr32/kernel/time.c               |  248 +++++++++-----------------
 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/mm/init.c                   |    3 -
 arch/avr32/oprofile/op_model_avr32.c   |    1 -
 drivers/char/Kconfig                   |    4 +-
 drivers/char/keyboard.c                |    3 +-
 drivers/clocksource/Makefile           |    1 +
 drivers/clocksource/tcb_clksrc.c       |  302 ++++++++++++++++++++++++++++++++
 drivers/misc/Kconfig                   |   33 ++++
 drivers/misc/Makefile                  |    1 +
 drivers/misc/atmel_tclib.c             |  161 +++++++++++++++++
 drivers/parport/Kconfig                |    2 +-
 drivers/usb/gadget/Kconfig             |    4 +-
 drivers/usb/gadget/atmel_usba_udc.c    |  156 ++++++++---------
 drivers/usb/gadget/atmel_usba_udc.h    |    9 +
 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/intc.h               |  128 --------------
 include/asm-avr32/irq.h                |    5 +
 include/asm-avr32/page.h               |    8 +-
 include/asm-avr32/serial.h             |   13 ++
 include/asm-avr32/xor.h                |    6 +
 include/linux/atmel_tc.h               |  252 ++++++++++++++++++++++++++
 include/linux/usb/atmel_usba_udc.h     |   22 +++
 33 files changed, 1327 insertions(+), 772 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/asm-avr32/serial.h
 create mode 100644 include/asm-avr32/xor.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/CHANGES        |    3 ++-
 fs/cifs/cifs_dfs_ref.c |    2 +-
 fs/cifs/cifsacl.c      |   14 ++++++++------
 fs/cifs/cifsacl.h      |    1 +
 fs/cifs/cifsfs.h       |    2 --
 fs/cifs/cifsproto.h    |    1 +
 fs/cifs/cifssmb.c      |   32 ++++++++++++++++++--------------
 fs/cifs/connect.c      |    1 +
 fs/cifs/transport.c    |   18 ++++++++++++++++++
 9 files changed, 50 insertions(+), 24 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 Documentation/kernel-parameters.txt
Auto-merged arch/powerpc/kernel/setup_32.c
Removed arch/powerpc/mm/lmb.c
Auto-merged arch/powerpc/platforms/powermac/setup.c
Auto-merged arch/powerpc/platforms/pseries/pci_dlpar.c
Auto-merged arch/ppc/platforms/radstone_ppc7d.c
Removed include/asm-powerpc/iseries/it_lp_reg_save.h
Merge made by recursive.
 Documentation/kernel-parameters.txt                |    2 +
 Documentation/powerpc/booting-without-of.txt       |  616 +++++++++++++++++++-
 Documentation/powerpc/phyp-assisted-dump.txt       |  127 ++++
 arch/powerpc/Kconfig                               |   64 ++-
 arch/powerpc/Makefile                              |   12 +-
 arch/powerpc/boot/Makefile                         |   40 +-
 arch/powerpc/boot/bamboo.c                         |    3 +-
 arch/powerpc/boot/cuboot-rainier.c                 |    3 +-
 arch/powerpc/boot/cuboot-sequoia.c                 |    3 +-
 arch/powerpc/boot/cuboot-taishan.c                 |    3 +-
 arch/powerpc/boot/cuboot-warp.c                    |    2 +-
 arch/powerpc/boot/cuboot-yosemite.c                |   44 ++
 arch/powerpc/boot/dts/bamboo.dts                   |    2 -
 arch/powerpc/boot/dts/canyonlands.dts              |  402 +++++++++++++
 arch/powerpc/boot/dts/ebony.dts                    |    2 -
 arch/powerpc/boot/dts/glacier.dts                  |  467 +++++++++++++++
 arch/powerpc/boot/dts/haleakala.dts                |    4 +-
 arch/powerpc/boot/dts/katmai.dts                   |    2 +-
 arch/powerpc/boot/dts/kilauea.dts                  |    4 +-
 arch/powerpc/boot/dts/ksi8560.dts                  |  267 +++++++++
 arch/powerpc/boot/dts/makalu.dts                   |    4 +-
 arch/powerpc/boot/dts/prpmc2800.dts                |  336 +++++------
 arch/powerpc/boot/dts/rainier.dts                  |    6 +-
 arch/powerpc/boot/dts/sequoia.dts                  |    6 +-
 arch/powerpc/boot/dts/taishan.dts                  |   31 +-
 arch/powerpc/boot/dts/walnut.dts                   |    1 -
 arch/powerpc/boot/dts/warp.dts                     |    1 -
 arch/powerpc/boot/dts/yosemite.dts                 |  304 ++++++++++
 arch/powerpc/boot/ebony.c                          |    3 +-
 arch/powerpc/boot/libfdt-wrapper.c                 |    2 +-
 arch/powerpc/boot/mpsc.c                           |    2 +-
 arch/powerpc/boot/mv64x60.c                        |    4 +-
 arch/powerpc/boot/mv64x60_i2c.c                    |    2 +-
 arch/powerpc/boot/prpmc2800.c                      |   23 +-
 arch/powerpc/boot/ps3-head.S                       |   25 +-
 arch/powerpc/boot/ps3.c                            |   23 +-
 arch/powerpc/boot/serial.c                         |    2 +-
 arch/powerpc/boot/simpleboot.c                     |   84 +++
 arch/powerpc/boot/treeboot-walnut.c                |    2 +-
 arch/powerpc/boot/virtex405-head.S                 |   30 +
 arch/powerpc/boot/wrapper                          |   32 +-
 arch/powerpc/configs/{ => 40x}/ep405_defconfig     |    0 
 arch/powerpc/configs/{ => 40x}/kilauea_defconfig   |    0 
 arch/powerpc/configs/{ => 40x}/makalu_defconfig    |    0 
 arch/powerpc/configs/{ => 40x}/walnut_defconfig    |    0 
 arch/powerpc/configs/{ => 44x}/bamboo_defconfig    |    0 
 .../canyonlands_defconfig}                         |  138 +----
 arch/powerpc/configs/{ => 44x}/ebony_defconfig     |    0 
 arch/powerpc/configs/{ => 44x}/katmai_defconfig    |    0 
 arch/powerpc/configs/{ => 44x}/rainier_defconfig   |    0 
 arch/powerpc/configs/{ => 44x}/sequoia_defconfig   |    0 
 arch/powerpc/configs/{ => 44x}/taishan_defconfig   |    0 
 arch/powerpc/configs/{ => 44x}/warp_defconfig      |    0 
 arch/powerpc/configs/chrp32_defconfig              |    7 +-
 arch/powerpc/configs/g5_defconfig                  |    7 +-
 arch/powerpc/configs/iseries_defconfig             |    7 +-
 .../configs/{ebony_defconfig => ksi8560_defconfig} |  427 +++++++-------
 arch/powerpc/configs/maple_defconfig               |  131 ++++-
 arch/powerpc/configs/pmac32_defconfig              |    7 +-
 .../configs/{walnut_defconfig => ppc40x_defconfig} |   31 +-
 arch/powerpc/configs/ppc44x_defconfig              |   14 +-
 arch/powerpc/configs/ppc64_defconfig               |    8 +-
 arch/powerpc/configs/pseries_defconfig             |    8 +-
 arch/powerpc/kernel/asm-offsets.c                  |   10 +-
 arch/powerpc/kernel/btext.c                        |    3 +-
 arch/powerpc/kernel/cpu_setup_44x.S                |    5 +-
 arch/powerpc/kernel/cputable.c                     |   28 +-
 arch/powerpc/kernel/crash.c                        |    3 +-
 arch/powerpc/kernel/crash_dump.c                   |    3 +-
 arch/powerpc/kernel/head_32.S                      |   17 -
 arch/powerpc/kernel/head_64.S                      |   22 +-
 arch/powerpc/kernel/head_fsl_booke.S               |   34 +-
 arch/powerpc/kernel/ibmebus.c                      |   12 +-
 arch/powerpc/kernel/iommu.c                        |    4 +-
 arch/powerpc/kernel/irq.c                          |   15 +-
 arch/powerpc/kernel/isa-bridge.c                   |    6 +-
 arch/powerpc/kernel/lparcfg.c                      |   12 +-
 arch/powerpc/kernel/machine_kexec.c                |    3 +-
 arch/powerpc/kernel/paca.c                         |   34 +-
 arch/powerpc/kernel/ppc_ksyms.c                    |    3 +-
 arch/powerpc/kernel/process.c                      |    5 -
 arch/powerpc/kernel/prom.c                         |   92 +++-
 arch/powerpc/kernel/prom_init.c                    |    8 +
 arch/powerpc/kernel/rtas.c                         |    4 +-
 arch/powerpc/kernel/rtas_flash.c                   |    2 +-
 arch/powerpc/kernel/rtas_pci.c                     |   29 +-
 arch/powerpc/kernel/setup-common.c                 |   11 +-
 arch/powerpc/kernel/setup_32.c                     |   14 +-
 arch/powerpc/kernel/setup_64.c                     |    4 +-
 arch/powerpc/kernel/sys_ppc32.c                    |    5 -
 arch/powerpc/kernel/vdso.c                         |    3 +-
 arch/powerpc/kernel/vio.c                          |   10 +-
 arch/powerpc/kernel/vmlinux.lds.S                  |   51 +-
 arch/powerpc/lib/string.S                          |   14 +
 arch/powerpc/math-emu/fabs.c                       |    2 +-
 arch/powerpc/math-emu/fadd.c                       |    2 +-
 arch/powerpc/math-emu/fadds.c                      |    2 +-
 arch/powerpc/math-emu/fcmpo.c                      |    2 +-
 arch/powerpc/math-emu/fcmpu.c                      |    2 +-
 arch/powerpc/math-emu/fctiw.c                      |    2 +-
 arch/powerpc/math-emu/fctiwz.c                     |    2 +-
 arch/powerpc/math-emu/fdiv.c                       |    6 +-
 arch/powerpc/math-emu/fdivs.c                      |    6 +-
 arch/powerpc/math-emu/fmadd.c                      |    2 +-
 arch/powerpc/math-emu/fmadds.c                     |    2 +-
 arch/powerpc/math-emu/fmr.c                        |    2 +-
 arch/powerpc/math-emu/fmsub.c                      |    2 +-
 arch/powerpc/math-emu/fmsubs.c                     |    2 +-
 arch/powerpc/math-emu/fmul.c                       |    2 +-
 arch/powerpc/math-emu/fmuls.c                      |    2 +-
 arch/powerpc/math-emu/fnabs.c                      |    2 +-
 arch/powerpc/math-emu/fneg.c                       |    2 +-
 arch/powerpc/math-emu/fnmadd.c                     |    2 +-
 arch/powerpc/math-emu/fnmadds.c                    |    2 +-
 arch/powerpc/math-emu/fnmsub.c                     |    2 +-
 arch/powerpc/math-emu/fnmsubs.c                    |    2 +-
 arch/powerpc/math-emu/fres.c                       |    2 +-
 arch/powerpc/math-emu/frsp.c                       |    2 +-
 arch/powerpc/math-emu/frsqrte.c                    |    2 +-
 arch/powerpc/math-emu/fsel.c                       |    2 +-
 arch/powerpc/math-emu/fsqrt.c                      |    2 +-
 arch/powerpc/math-emu/fsqrts.c                     |    2 +-
 arch/powerpc/math-emu/fsub.c                       |    2 +-
 arch/powerpc/math-emu/fsubs.c                      |    2 +-
 arch/powerpc/math-emu/lfd.c                        |    2 +-
 arch/powerpc/math-emu/lfs.c                        |    2 +-
 arch/powerpc/math-emu/mcrfs.c                      |    4 +-
 arch/powerpc/math-emu/mffs.c                       |    2 +-
 arch/powerpc/math-emu/mtfsb0.c                     |    2 +-
 arch/powerpc/math-emu/mtfsb1.c                     |    2 +-
 arch/powerpc/math-emu/mtfsf.c                      |    2 +-
 arch/powerpc/math-emu/mtfsfi.c                     |    2 +-
 arch/powerpc/math-emu/stfd.c                       |    2 +-
 arch/powerpc/math-emu/stfiwx.c                     |    2 +-
 arch/powerpc/math-emu/stfs.c                       |    2 +-
 arch/powerpc/mm/40x_mmu.c                          |    2 +-
 arch/powerpc/mm/44x_mmu.c                          |    2 +-
 arch/powerpc/mm/Makefile                           |    2 +-
 arch/powerpc/mm/fsl_booke_mmu.c                    |   48 +-
 arch/powerpc/mm/hash_utils_64.c                    |   32 +-
 arch/powerpc/mm/init_32.c                          |   27 +-
 arch/powerpc/mm/init_64.c                          |    6 +-
 arch/powerpc/mm/lmb.c                              |  357 -----------
 arch/powerpc/mm/mem.c                              |   21 +-
 arch/powerpc/mm/mmu_decl.h                         |    4 +-
 arch/powerpc/mm/numa.c                             |    3 +-
 arch/powerpc/mm/pgtable_32.c                       |    5 +-
 arch/powerpc/mm/ppc_mmu_32.c                       |   15 +-
 arch/powerpc/mm/stab.c                             |    4 +-
 arch/powerpc/oprofile/cell/spu_task_sync.c         |   12 +-
 arch/powerpc/oprofile/cell/vma_map.c               |   10 +-
 arch/powerpc/oprofile/op_model_cell.c              |   14 +-
 arch/powerpc/platforms/40x/ep405.c                 |    2 +
 arch/powerpc/platforms/40x/kilauea.c               |    4 +-
 arch/powerpc/platforms/40x/makalu.c                |    2 +
 arch/powerpc/platforms/40x/virtex.c                |    2 +
 arch/powerpc/platforms/40x/walnut.c                |    4 +-
 arch/powerpc/platforms/44x/44x.h                   |    1 -
 arch/powerpc/platforms/44x/Kconfig                 |   27 +
 arch/powerpc/platforms/44x/Makefile                |    4 +-
 arch/powerpc/platforms/44x/bamboo.c                |   15 +-
 arch/powerpc/platforms/44x/canyonlands.c           |   63 ++
 arch/powerpc/platforms/44x/ebony.c                 |    5 +-
 arch/powerpc/platforms/44x/idle.c                  |   67 +++
 arch/powerpc/platforms/44x/katmai.c                |    5 +-
 arch/powerpc/platforms/44x/misc_44x.S              |   11 -
 arch/powerpc/platforms/44x/rainier.c               |    4 +-
 arch/powerpc/platforms/44x/sequoia.c               |    4 +-
 arch/powerpc/platforms/44x/taishan.c               |    5 +-
 arch/powerpc/platforms/44x/warp-nand.c             |    3 +-
 arch/powerpc/platforms/44x/warp.c                  |    6 +-
 arch/powerpc/platforms/52xx/lite5200.c             |    4 +-
 arch/powerpc/platforms/85xx/Kconfig                |    7 +
 arch/powerpc/platforms/85xx/Makefile               |    1 +
 arch/powerpc/platforms/85xx/ksi8560.c              |  257 ++++++++
 arch/powerpc/platforms/85xx/mpc85xx_ds.c           |    2 +-
 arch/powerpc/platforms/8xx/m8xx_setup.c            |    7 +-
 arch/powerpc/platforms/Kconfig.cputype             |    2 +
 arch/powerpc/platforms/cell/iommu.c                |   10 +-
 arch/powerpc/platforms/cell/pervasive.c            |    2 +-
 arch/powerpc/platforms/cell/ras.c                  |   10 +-
 arch/powerpc/platforms/cell/spu_base.c             |    8 +-
 arch/powerpc/platforms/cell/spu_callbacks.c        |    2 +-
 arch/powerpc/platforms/cell/spu_manage.c           |    8 +-
 arch/powerpc/platforms/cell/spufs/file.c           |    4 +-
 arch/powerpc/platforms/cell/spufs/run.c            |   10 +-
 arch/powerpc/platforms/celleb/beat.c               |   17 +-
 arch/powerpc/platforms/celleb/beat.h               |    4 +-
 arch/powerpc/platforms/celleb/beat_wrapper.h       |    3 +-
 arch/powerpc/platforms/celleb/htab.c               |    7 +-
 arch/powerpc/platforms/celleb/interrupt.c          |   26 +-
 arch/powerpc/platforms/celleb/scc_epci.c           |    8 +-
 arch/powerpc/platforms/celleb/scc_sio.c            |    4 +-
 arch/powerpc/platforms/celleb/spu_priv1.c          |    3 +-
 arch/powerpc/platforms/celleb/udbg_beat.c          |    5 +-
 arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |   10 +-
 arch/powerpc/platforms/embedded6xx/prpmc2800.c     |    4 +-
 arch/powerpc/platforms/iseries/exception.S         |   12 +-
 arch/powerpc/platforms/iseries/ipl_parms.h         |    2 -
 arch/powerpc/platforms/iseries/lpardata.c          |  121 ++++-
 arch/powerpc/platforms/iseries/naca.h              |    2 +-
 arch/powerpc/platforms/iseries/pci.c               |    3 +-
 arch/powerpc/platforms/iseries/release_data.h      |    2 +-
 arch/powerpc/platforms/iseries/spcomm_area.h       |    2 -
 arch/powerpc/platforms/iseries/vpd_areas.h         |    4 +-
 arch/powerpc/platforms/maple/pci.c                 |   47 --
 arch/powerpc/platforms/maple/setup.c               |    4 +-
 arch/powerpc/platforms/pasemi/dma_lib.c            |  144 +++++
 arch/powerpc/platforms/pasemi/iommu.c              |   19 +-
 arch/powerpc/platforms/powermac/setup.c            |    2 +-
 arch/powerpc/platforms/ps3/device-init.c           |   78 ++-
 arch/powerpc/platforms/ps3/htab.c                  |    3 +-
 arch/powerpc/platforms/ps3/interrupt.c             |    2 +-
 arch/powerpc/platforms/ps3/mm.c                    |    3 +-
 arch/powerpc/platforms/ps3/os-area.c               |    3 +-
 arch/powerpc/platforms/ps3/setup.c                 |   14 +-
 arch/powerpc/platforms/ps3/spu.c                   |    7 +
 arch/powerpc/platforms/pseries/Makefile            |    1 +
 arch/powerpc/platforms/pseries/eeh.c               |    5 +-
 arch/powerpc/platforms/pseries/lpar.c              |   25 +-
 arch/powerpc/platforms/pseries/pci_dlpar.c         |    2 +-
 arch/powerpc/platforms/pseries/phyp_dump.c         |  507 ++++++++++++++++
 arch/powerpc/platforms/pseries/pseries.h           |    2 +
 arch/powerpc/platforms/pseries/reconfig.c          |   12 +-
 arch/powerpc/platforms/pseries/scanlog.c           |   37 +-
 arch/powerpc/platforms/pseries/setup.c             |    7 +-
 arch/powerpc/sysdev/Makefile                       |    1 +
 arch/powerpc/sysdev/cpm1.c                         |    2 +-
 arch/powerpc/sysdev/cpm2.c                         |    2 +-
 arch/powerpc/sysdev/dart_iommu.c                   |    2 +-
 arch/powerpc/sysdev/mpic.c                         |   41 +-
 arch/powerpc/sysdev/mv64x60_dev.c                  |   78 ++--
 arch/powerpc/sysdev/mv64x60_pci.c                  |    6 +-
 arch/powerpc/sysdev/mv64x60_pic.c                  |    4 +-
 arch/powerpc/sysdev/mv64x60_udbg.c                 |    2 +-
 arch/powerpc/sysdev/ppc4xx_pci.c                   |  133 ++++-
 arch/powerpc/sysdev/ppc4xx_pci.h                   |   59 ++
 arch/powerpc/sysdev/ppc4xx_soc.c                   |  200 +++++++
 arch/powerpc/sysdev/qe_lib/qe_io.c                 |    2 +-
 arch/powerpc/sysdev/qe_lib/ucc_fast.c              |   32 +-
 arch/powerpc/sysdev/qe_lib/ucc_slow.c              |   18 +-
 arch/powerpc/sysdev/rtc_cmos_setup.c               |    2 +
 arch/powerpc/sysdev/tsi108_dev.c                   |    4 +-
 arch/powerpc/sysdev/tsi108_pci.c                   |    4 +-
 arch/powerpc/xmon/xmon.c                           |   11 -
 arch/ppc/8xx_io/commproc.c                         |    2 +-
 arch/ppc/8xx_io/fec.c                              |    4 +-
 arch/ppc/kernel/head.S                             |   17 -
 arch/ppc/mm/init.c                                 |    1 -
 arch/ppc/platforms/radstone_ppc7d.c                |    8 +-
 arch/ppc/syslib/mpc52xx_setup.c                    |    2 +-
 arch/sparc64/Kconfig                               |    1 +
 drivers/block/viodasd.c                            |    2 +-
 drivers/char/hvc_beat.c                            |    4 +-
 drivers/char/xilinx_hwicap/buffer_icap.c           |   22 +-
 drivers/char/xilinx_hwicap/buffer_icap.h           |    5 +-
 drivers/char/xilinx_hwicap/fifo_icap.c             |   31 +-
 drivers/char/xilinx_hwicap/fifo_icap.h             |    1 +
 drivers/char/xilinx_hwicap/xilinx_hwicap.c         |   63 ++-
 drivers/char/xilinx_hwicap/xilinx_hwicap.h         |   24 +
 drivers/net/Makefile                               |    3 +-
 drivers/net/iseries_veth.c                         |    3 +-
 drivers/net/pasemi_mac.c                           |  355 ++++++++++--
 drivers/net/pasemi_mac.h                           |   35 ++-
 drivers/net/pasemi_mac_ethtool.c                   |  159 +++++
 drivers/net/ps3_gelic_net.c                        |   81 +++
 drivers/net/ps3_gelic_net.h                        |   20 +
 drivers/of/Kconfig                                 |   12 +
 drivers/of/Makefile                                |    2 +
 drivers/of/base.c                                  |   26 +
 drivers/of/gpio.c                                  |  242 ++++++++
 drivers/of/i2c.c                                   |  115 ++++
 drivers/ps3/ps3-sys-manager.c                      |   74 ++-
 drivers/ps3/sys-manager-core.c                     |   16 +-
 drivers/serial/of_serial.c                         |    4 +-
 include/asm-powerpc/Kbuild                         |    2 +-
 include/asm-powerpc/abs_addr.h                     |    3 +-
 include/asm-powerpc/cputhreads.h                   |    2 +-
 include/asm-powerpc/dcr-native.h                   |   17 +
 include/asm-powerpc/dcr-regs.h                     |   78 +++
 include/asm-powerpc/gpio.h                         |   56 ++
 include/asm-powerpc/iseries/alpaca.h               |   31 +
 include/asm-powerpc/iseries/it_lp_reg_save.h       |   85 ---
 include/asm-powerpc/lmb.h                          |   82 +---
 include/asm-powerpc/machdep.h                      |    5 +-
 include/asm-powerpc/macio.h                        |    2 +-
 include/asm-powerpc/mmu-40x.h                      |    2 -
 include/asm-powerpc/mmu-44x.h                      |    2 -
 include/asm-powerpc/mmu-8xx.h                      |    2 -
 include/asm-powerpc/mmu-fsl-booke.h                |    6 -
 include/asm-powerpc/mmu-hash32.h                   |    2 -
 include/asm-powerpc/mmu-hash64.h                   |    3 -
 include/asm-powerpc/paca.h                         |   12 +-
 include/asm-powerpc/page.h                         |    1 +
 include/asm-powerpc/page_32.h                      |    2 -
 include/asm-powerpc/pasemi_dma.h                   |   77 +++-
 include/asm-powerpc/pgtable-ppc32.h                |    8 +-
 include/asm-powerpc/phyp_dump.h                    |   47 ++
 include/asm-powerpc/pmi.h                          |    2 -
 include/asm-powerpc/ppc4xx.h                       |   18 +
 include/asm-powerpc/ps3.h                          |    7 +-
 include/asm-powerpc/sparsemem.h                    |    1 +
 include/asm-powerpc/string.h                       |    2 +
 include/asm-powerpc/types.h                        |    7 +
 include/asm-sparc64/lmb.h                          |   10 +
 include/linux/lmb.h                                |   85 +++
 include/linux/of.h                                 |    1 +
 include/linux/of_gpio.h                            |   69 +++
 include/linux/of_i2c.h                             |   24 +
 lib/Kconfig                                        |    3 +
 lib/Makefile                                       |    2 +
 lib/lmb.c                                          |  428 ++++++++++++++
 312 files changed, 7633 insertions(+), 2120 deletions(-)
 create mode 100644 Documentation/powerpc/phyp-assisted-dump.txt
 create mode 100644 arch/powerpc/boot/cuboot-yosemite.c
 create mode 100644 arch/powerpc/boot/dts/canyonlands.dts
 create mode 100644 arch/powerpc/boot/dts/glacier.dts
 create mode 100644 arch/powerpc/boot/dts/ksi8560.dts
 create mode 100644 arch/powerpc/boot/dts/yosemite.dts
 create mode 100644 arch/powerpc/boot/simpleboot.c
 create mode 100644 arch/powerpc/boot/virtex405-head.S
 rename arch/powerpc/configs/{ => 40x}/ep405_defconfig (100%)
 rename arch/powerpc/configs/{ => 40x}/kilauea_defconfig (100%)
 rename arch/powerpc/configs/{ => 40x}/makalu_defconfig (100%)
 copy arch/powerpc/configs/{ => 40x}/walnut_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/bamboo_defconfig (100%)
 copy arch/powerpc/configs/{taishan_defconfig => 44x/canyonlands_defconfig} (82%)
 copy arch/powerpc/configs/{ => 44x}/ebony_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/katmai_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/rainier_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/sequoia_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/taishan_defconfig (100%)
 rename arch/powerpc/configs/{ => 44x}/warp_defconfig (100%)
 rename arch/powerpc/configs/{ebony_defconfig => ksi8560_defconfig} (72%)
 rename arch/powerpc/configs/{walnut_defconfig => ppc40x_defconfig} (97%)
 delete mode 100644 arch/powerpc/mm/lmb.c
 create mode 100644 arch/powerpc/platforms/44x/canyonlands.c
 create mode 100644 arch/powerpc/platforms/44x/idle.c
 create mode 100644 arch/powerpc/platforms/85xx/ksi8560.c
 create mode 100644 arch/powerpc/platforms/pseries/phyp_dump.c
 create mode 100644 arch/powerpc/sysdev/ppc4xx_soc.c
 create mode 100644 drivers/net/pasemi_mac_ethtool.c
 create mode 100644 drivers/of/gpio.c
 create mode 100644 drivers/of/i2c.c
 create mode 100644 include/asm-powerpc/gpio.h
 create mode 100644 include/asm-powerpc/iseries/alpaca.h
 delete mode 100644 include/asm-powerpc/iseries/it_lp_reg_save.h
 create mode 100644 include/asm-powerpc/phyp_dump.h
 create mode 100644 include/asm-powerpc/ppc4xx.h
 create mode 100644 include/asm-sparc64/lmb.h
 create mode 100644 include/linux/lmb.h
 create mode 100644 include/linux/of_gpio.h
 create mode 100644 include/linux/of_i2c.h
 create mode 100644 lib/lmb.c
##
# 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            |    9 +
 Documentation/video4linux/CARDLIST.saa7134         |    9 +
 drivers/media/Kconfig                              |   11 +-
 drivers/media/common/ir-functions.c                |    2 +-
 drivers/media/common/ir-keymaps.c                  |  102 ++-
 drivers/media/common/saa7146_core.c                |    8 +-
 drivers/media/common/saa7146_i2c.c                 |    6 +-
 drivers/media/common/saa7146_vbi.c                 |    4 +-
 drivers/media/common/saa7146_video.c               |    4 +-
 drivers/media/dvb/b2c2/Kconfig                     |    5 +
 drivers/media/dvb/b2c2/Makefile                    |    2 +
 drivers/media/dvb/b2c2/flexcop-common.h            |   17 +-
 drivers/media/dvb/b2c2/flexcop-dma.c               |    4 +-
 drivers/media/dvb/b2c2/flexcop-eeprom.c            |    9 +-
 drivers/media/dvb/b2c2/flexcop-fe-tuner.c          |  209 ++-
 drivers/media/dvb/b2c2/flexcop-i2c.c               |  180 ++-
 drivers/media/dvb/b2c2/flexcop-misc.c              |    2 +
 drivers/media/dvb/b2c2/flexcop-pci.c               |    2 +-
 drivers/media/dvb/b2c2/flexcop-reg.h               |    2 +
 drivers/media/dvb/b2c2/flexcop-sram.c              |   28 +-
 drivers/media/dvb/b2c2/flexcop-usb.c               |   17 +-
 drivers/media/dvb/b2c2/flexcop.c                   |   18 +-
 drivers/media/dvb/bt8xx/Kconfig                    |    2 +-
 drivers/media/dvb/bt8xx/Makefile                   |    5 +-
 drivers/media/dvb/bt8xx/dst.c                      |    2 +-
 drivers/media/dvb/bt8xx/dst_ca.c                   |   10 +-
 drivers/media/dvb/bt8xx/dvb-bt8xx.c                |   23 +-
 drivers/media/dvb/bt8xx/dvb-bt8xx.h                |    2 +-
 drivers/media/dvb/cinergyT2/cinergyT2.c            |    9 +-
 drivers/media/dvb/dvb-core/demux.h                 |    2 +
 drivers/media/dvb/dvb-core/dmxdev.c                |   20 +-
 drivers/media/dvb/dvb-core/dvb_ca_en50221.c        |   36 +-
 drivers/media/dvb/dvb-core/dvb_demux.c             |    6 +-
 drivers/media/dvb/dvb-core/dvb_frontend.c          |   30 +-
 drivers/media/dvb/dvb-core/dvb_net.c               |   32 +-
 drivers/media/dvb/dvb-core/dvbdev.c                |   47 +-
 drivers/media/dvb/dvb-core/dvbdev.h                |   13 +-
 drivers/media/dvb/dvb-usb/Kconfig                  |    1 +
 drivers/media/dvb/dvb-usb/a800.c                   |    6 +-
 drivers/media/dvb/dvb-usb/af9005.c                 |    5 +-
 drivers/media/dvb/dvb-usb/au6610.c                 |    6 +-
 drivers/media/dvb/dvb-usb/cxusb.c                  |   48 +-
 drivers/media/dvb/dvb-usb/dib0700.h                |    4 +
 drivers/media/dvb/dvb-usb/dib0700_core.c           |    9 +-
 drivers/media/dvb/dvb-usb/dib0700_devices.c        |  325 ++++-
 drivers/media/dvb/dvb-usb/dibusb-mb.c              |   14 +-
 drivers/media/dvb/dvb-usb/dibusb-mc.c              |    5 +-
 drivers/media/dvb/dvb-usb/digitv.c                 |    8 +-
 drivers/media/dvb/dvb-usb/dtt200u.c                |   17 +-
 drivers/media/dvb/dvb-usb/dvb-usb-common.h         |    3 +-
 drivers/media/dvb/dvb-usb/dvb-usb-dvb.c            |    9 +-
 drivers/media/dvb/dvb-usb/dvb-usb-ids.h            |   13 +-
 drivers/media/dvb/dvb-usb/dvb-usb-init.c           |   16 +-
 drivers/media/dvb/dvb-usb/dvb-usb.h                |    5 +-
 drivers/media/dvb/dvb-usb/gl861.c                  |    6 +-
 drivers/media/dvb/dvb-usb/gp8psk-fe.c              |    4 +-
 drivers/media/dvb/dvb-usb/gp8psk.c                 |    5 +-
 drivers/media/dvb/dvb-usb/m920x.c                  |   34 +-
 drivers/media/dvb/dvb-usb/nova-t-usb2.c            |    5 +-
 drivers/media/dvb/dvb-usb/opera1.c                 |    6 +-
 drivers/media/dvb/dvb-usb/ttusb2.c                 |   66 +-
 drivers/media/dvb/dvb-usb/umt-010.c                |    5 +-
 drivers/media/dvb/dvb-usb/vp702x-fe.c              |   18 +-
 drivers/media/dvb/dvb-usb/vp702x.c                 |    5 +-
 drivers/media/dvb/dvb-usb/vp7045.c                 |    6 +-
 drivers/media/dvb/frontends/Kconfig                |   12 +
 drivers/media/dvb/frontends/Makefile               |    2 +
 drivers/media/dvb/frontends/bcm3510.c              |    4 +-
 drivers/media/dvb/frontends/bcm3510.h              |    2 +-
 drivers/media/dvb/frontends/cx22700.c              |   12 +-
 drivers/media/dvb/frontends/cx22700.h              |    2 +-
 drivers/media/dvb/frontends/cx22702.c              |   26 +-
 drivers/media/dvb/frontends/cx22702.h              |    2 +-
 drivers/media/dvb/frontends/cx24110.c              |    6 +-
 drivers/media/dvb/frontends/cx24110.h              |    2 +-
 drivers/media/dvb/frontends/cx24113.h              |   48 +
 drivers/media/dvb/frontends/cx24123.c              |  304 +++--
 drivers/media/dvb/frontends/cx24123.h              |   21 +-
 drivers/media/dvb/frontends/dib3000.h              |    2 +-
 drivers/media/dvb/frontends/dib3000mc.h            |    2 +-
 drivers/media/dvb/frontends/dvb-pll.c              |  260 +---
 drivers/media/dvb/frontends/dvb-pll.h              |   33 +-
 drivers/media/dvb/frontends/isl6405.c              |  164 ++
 drivers/media/dvb/frontends/isl6405.h              |   74 +
 drivers/media/dvb/frontends/isl6421.h              |    2 +-
 drivers/media/dvb/frontends/itd1000.c              |  400 +++++
 drivers/media/dvb/frontends/itd1000.h              |   42 +
 drivers/media/dvb/frontends/itd1000_priv.h         |   88 +
 drivers/media/dvb/frontends/l64781.c               |    2 +-
 drivers/media/dvb/frontends/l64781.h               |    2 +-
 drivers/media/dvb/frontends/lgdt330x.c             |   40 +-
 drivers/media/dvb/frontends/lgdt330x.h             |    2 +-
 drivers/media/dvb/frontends/lnbp21.h               |    2 +-
 drivers/media/dvb/frontends/mt2060.h               |    2 +-
 drivers/media/dvb/frontends/mt2131.c               |   14 +-
 drivers/media/dvb/frontends/mt2131.h               |    2 +-
 drivers/media/dvb/frontends/mt2266.h               |    2 +-
 drivers/media/dvb/frontends/mt312.c                |  151 ++-
 drivers/media/dvb/frontends/mt312.h                |    5 +-
 drivers/media/dvb/frontends/mt312_priv.h           |    5 +-
 drivers/media/dvb/frontends/mt352.c                |    8 +-
 drivers/media/dvb/frontends/mt352.h                |    2 +-
 drivers/media/dvb/frontends/nxt200x.c              |   26 +-
 drivers/media/dvb/frontends/nxt200x.h              |    2 +-
 drivers/media/dvb/frontends/nxt6000.c              |    2 +-
 drivers/media/dvb/frontends/nxt6000.h              |    2 +-
 drivers/