Switched to branch "2.6.25-mc5"
Switched to branch "ide"
Switched to branch "2.6.25-mc5"
Already on "2.6.25-mc5"
fatal: Not a valid object name: '2.6.25'.
Switched to branch "gregkh-driver"
Switched to branch "2.6.25-mc5"
Checking out files:  47% (187/395)   
Checking out files:  48% (190/395)   
Checking out files:  49% (194/395)   
Checking out files:  50% (198/395)   
Checking out files:  51% (202/395)   
Checking out files:  52% (206/395)   
Checking out files:  53% (210/395)   
Checking out files:  54% (214/395)   
Checking out files:  55% (218/395)   
Checking out files:  56% (222/395)   
Checking out files:  57% (226/395)   
Checking out files:  58% (230/395)   
Checking out files:  59% (234/395)   
Checking out files:  60% (237/395)   
Checking out files:  61% (241/395)   
Checking out files:  62% (245/395)   
Checking out files:  63% (249/395)   
Checking out files:  64% (253/395)   
Checking out files:  65% (257/395)   
Checking out files:  66% (261/395)   
Checking out files:  67% (265/395)   
Checking out files:  68% (269/395)   
Checking out files:  69% (273/395)   
Checking out files:  69% (274/395)   
Checking out files:  70% (277/395)   
Checking out files:  71% (281/395)   
Checking out files:  72% (285/395)   
Checking out files:  73% (289/395)   
Checking out files:  74% (293/395)   
Checking out files:  75% (297/395)   
Checking out files:  76% (301/395)   
Checking out files:  77% (305/395)   
Checking out files:  78% (309/395)   
Checking out files:  79% (313/395)   
Checking out files:  80% (316/395)   
Checking out files:  81% (320/395)   
Checking out files:  82% (324/395)   
Checking out files:  83% (328/395)   
Checking out files:  84% (332/395)   
Checking out files:  85% (336/395)   
Checking out files:  86% (340/395)   
Checking out files:  87% (344/395)   
Checking out files:  88% (348/395)   
Checking out files:  89% (352/395)   
Checking out files:  90% (356/395)   
Checking out files:  91% (360/395)   
Checking out files:  92% (364/395)   
Checking out files:  93% (368/395)   
Checking out files:  94% (372/395)   
Checking out files:  95% (376/395)   
Checking out files:  96% (380/395)   
Checking out files:  97% (384/395)   
Checking out files:  98% (388/395)   
Checking out files:  99% (392/395)   
Checking out files: 100% (395/395)   
Checking out files: 100% (395/395), 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.
Switched to branch "2.6.25-mc5"
Switched to branch "gregkh-pci"
Switched to branch "2.6.25-mc5"
Already on "2.6.25-mc5"
Automatic merge failed; fix conflicts and then commit the result.
Switched to branch "gregkh-usb"
.dotest/patch:225: space before tab in indent.
 	 */
warning: 1 line adds 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.
.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:494: space before tab in indent.
 	whcrc->umc_dev = umc_dev;
.dotest/patch:507: space before tab in indent.
 	result = whcrc_setup_rc_umc(whcrc);
.dotest/patch:509: space before tab in indent.
 		dev_err(dev, "Can't setup RC UMC interface: %d\n", result);
.dotest/patch:514: space before tab in indent.
 		dev_err(dev, "Can't setup RC interface: %d\n", result);
.dotest/patch:576: space before tab in indent.
 	.probe = whcrc_probe,
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
.dotest/patch:969: space before tab in indent.
 	const struct firmware *fw;
.dotest/patch:1329: space before tab in indent.
 	const struct firmware *fw;
.dotest/patch:3487: space before tab in indent.
    				"Dropping\n", untd_hdr->reserved1);
.dotest/patch:4783: space before tab in indent.
 	/*
warning: 4 lines add whitespace errors.
Switched to branch "2.6.25-mc5"
Already on "2.6.25-mc5"
Switched to branch "gregkh-ldp"
.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-mc5"
error: branch 'agp' not found.
remote: Counting objects: 1   
remote: Counting objects: 17, done.
remote: Compressing objects:  11% (1/9)   
remote: Compressing objects:  22% (2/9)   
remote: Compressing objects:  33% (3/9)   
remote: Compressing objects:  4remote: 4% (4/9)   
remote: Compressing objects:  55% (5/9)   
remote: Compressing objects:  66% (6/9)   
remote: Compressing objects:  77% (7/9)   
remote: Compressingremote:  objects:  88% (8/9)   
remote: Compressing objects: 100% (9/9)   
remote: Compressing objects: 100% (9/9), done.
remote: Total 9 (delta 7), reused 0 (dremote: elta 0)
From /pub/scm/linux/kernel/git/sfrench/cifs-2.6
   8d14213..675c467  master     -> cifs
remote: Counting objects: 215, done.
remote: Compressing objects:   4% (1/25)   
remote: Compressing objects:   8% (2/25)   
remote: Compressing objects:  12% (3/25)   
remote: Compressing objects:  16% (4/25)   
remote: Compressing objects:  20% (5/25)   
remote: Compressing objects:  24% (6/25)   
remote: Compressing objects:  28% (7/25)   
remote: Compressing objects:remote:   32% (8/25)   
remote: Compressing objects:  36% (9/25)   
remote: Compressing objects:  40% (10/25)   
remote: Compressing objects:  44% (11/25)   
remote: Coremote: mpressing objects:  48% (12/25)   
remote: Compressing objects:  52% (13/25)   
remote: Compressing objects:  56% (14/25)   
remote: Compressing objectsremote: :  60% (15/25)   
remote: Compressing objects:  64% (16/25)   
remote: Compressing objects:  68% (17/25)   
remote: Compressing objects:  72% (18/25)   remote: 
remote: Compressing objects:  76% (19/25)   
remote: Compressing objects:  80% (20/25)   
remote: Compressing objects:  84% (21/25)   
remote: Compressing objeremote: cts:  88% (22/25)   
remote: Compressing objects:  92% (23/25)   
remote: Compressing objects:  96% (24/25)   
remote: Compressing objects: 100% (25/25)remote:    
remote: Compressing objects: 100% (25/25), done.
remote: Total 142 (delta 121), reused 138 (delta 117)
Receiving objects:   0% (1/142)   
Receiving objects:   1% (2/142)   
Receiving objects:   2% (3/142)   
Receiving objects:   3% (5/142)   
Receiving objects:   4% (6/142)   
Receiving objects:   5% (8/142)   
Receiving objects:   6% (9/142)   
Receiving objects:   7% (10/142)   
Receiving objects:   8% (12/142)   
Receiving objects:   9% (13/142)   
Receiving objects:  10% (15/142)   
Receiving objects:  11% (16/142)   
Receiving objects:  12% (18/142)   
Receiving objects:  13% (19/142)   
Receiving objects:  14% (20/142)   
Receiving objects:  15% (22/142)   
Receiving objects:  16% (23/142)   
Receiving objects:  17% (25/142)   
Receiving objects:  18% (26/142)   
Receiving objects:  19% (27/142)   
Receiving objects:  20% (29/142)   
Receiving objects:  21% (30/142)   
Receiving objects:  22% (32/142)   
Receiving objects:  23% (33/142)   
Receiving objects:  24% (35/142)   
Receiving objects:  25% (36/142)   
Receiving objects:  26% (37/142)   
Receiving objects:  27% (39/142)   
Receiving objects:  28% (40/142)   
Receiving objects:  29% (42/142)   
Receiving objects:  30% (43/142)   
Receiving objects:  31% (45/142)   
Receiving objects:  32% (46/142)   
Receiving objects:  33% (47/142)   
Receiving objects:  34% (49/142)   
Receiving objects:  35% (50/142)   
Receiving objects:  36% (52/142)   
Receiving objects:  37% (53/142)   
Receiving objects:  38% (54/142)   
Receiving objects:  39% (56/142)   
Receiving objects:  40% (57/142)   
Receiving objects:  41% (59/142)   
Receiving objects:  42% (60/142)   
Receiving objects:  43% (62/142)   
Receiving objects:  44% (63/142)   
Receiving objects:  45% (64/142)   
Receiving objects:  46% (66/142)   
Receiving objects:  47% (67/142)   
Receiving objects:  48% (69/142)   
Receiving objects:  49% (70/142)   
Receiving objects:  50% (71/142)   
Receiving objects:  51% (73/142)   
Receiving objects:  52% (74/142)   
Receiving objects:  53% (76/142)   
Receiving objects:  54% (77/142)   
Receiving objects:  55% (79/142)   
Receiving objects:  56% (80/142)   
Receiving objects:  57% (81/142)   
Receiving objects:  58% (83/142)   
Receiving objects:  59% (84/142)   
Receiving objects:  60% (86/142)   
Receiving objects:  61% (87/142)   
Receiving objects:  62% (89/142)   
Receiving objects:  63% (90/142)   
Receiving objects:  64% (91/142)   
Receiving objects:  65% (93/142)   
Receiving objects:  66% (94/142)   
Receiving objects:  67% (96/142)   
Receiving objects:  68% (97/142)   
Receiving objects:  69% (98/142)   
Receiving objects:  70% (100/142)   
Receiving objects:  71% (101/142)   
Receiving objects:  72% (103/142)   
Receiving objects:  73% (104/142)   
Receiving objects:  74% (106/142)   
Receiving objects:  75% (107/142)   
Receiving objects:  76% (108/142)   
Receiving objects:  77% (110/142)   
Receiving objects:  78% (111/142)   
Receiving objects:  79% (113/142)   
Receiving objects:  80% (114/142)   
Receiving objects:  81% (116/142)   
Receiving objects:  82% (117/142)   
Receiving objects:  83% (118/142)   
Receiving objects:  84% (120/142)   
Receiving objects:  85% (121/142)   
Receiving objects:  86% (123/142)   
Receiving objects:  87% (124/142)   
Receiving objects:  88% (125/142)   
Receiving objects:  89% (127/142)   
Receiving objects:  90% (128/142)   
Receiving objects:  91% (130/142)   
Receiving objects:  92% (131/142)   
Receiving objects:  93% (133/142)   
Receiving objects:  94% (134/142)   
Receiving objects:  95% (135/142)   
Receiving objects:  96% (137/142)   
Receiving objects:  97% (138/142)   
Receiving objects:  98% (140/142)   
Receiving objects:  99% (141/142)   
Receiving objects: 100% (142/142)   
Receiving objects: 100% (142/142), 19.29 KiB, done.
Resolving deltas:   7% (9/121)   
Resolving deltas:  19% (23/121)   
Resolving deltas:  28% (34/121)   
Resolving deltas:  29% (36/121)   
Resolving deltas:  33% (40/121)   
Resolving deltas:  35% (43/121)   
Resolving deltas:  36% (44/121)   
Resolving deltas:  37% (45/121)   
Resolving deltas:  38% (46/121)   
Resolving deltas:  39% (48/121)   
Resolving deltas:  40% (49/121)   
Resolving deltas:  41% (50/121)   
Resolving deltas:  42% (51/121)   
Resolving deltas:  47% (58/121)   
Resolving deltas:  48% (59/121)   
Resolving deltas:  52% (64/121)   
Resolving deltas:  53% (65/121)   
Resolving deltas:  55% (67/121)   
Resolving deltas:  57% (69/121)   
Resolving deltas:  61% (74/121)   
Resolving deltas:  63% (77/121)   
Resolving deltas:  65% (79/121)   
Resolving deltas:  66% (80/121)   
Resolving deltas:  67% (82/121)   
Resolving deltas:  71% (87/121)   
Resolving deltas:  76% (92/121)   
Resolving deltas:  77% (94/121)   
Resolving deltas:  78% (95/121)   
Resolving deltas:  79% (96/121)   
Resolving deltas:  80% (97/121)   
Resolving deltas:  81% (99/121)   
Resolving deltas:  82% (100/121)   
Resolving deltas:  83% (101/121)   
Resolving deltas:  86% (105/121)   
Resolving deltas:  90% (109/121)   
Resolving deltas:  93% (113/121)   
Resolving deltas:  96% (117/121)   
Resolving deltas: 100% (121/121)   
Resolving deltas: 100% (121/121), completed with 43 local objects.
From /pub/scm/linux/kernel/git/paulus/powerpc
   7711684..9f264be  master     -> powerpc
fatal: Not a valid object name: '2.6.25'.
Switched to branch "i2c"
Switched to branch "2.6.25-mc5"
Already on "2.6.25-mc5"
remote: Counting objects: 66, done.
remote: Compressing objects:   6% (1/15)   
remote: Compressing objects:  13% (2/15)   
remote: Compressing objects:  20% (3remote: /15)   
remote: Compressing objects:  26% (4/15)   
remote: Compressing objects:  33% (5/15)   
remote: Compressing objects:  40% (6/15)   
remote: Compressing remote: objects:  46% (7/15)   
remote: Compressing objects:  53% (8/15)   
remote: Compressing objects:  60% (9/15)   
remote: Compressing objects:  66% (10/15remote: )   
remote: Compressing objects:  73% (11/15)   
remote: Compressing objects:  80% (12/15)   
remote: Compressing objects:  86% (13/15)   
remote: Compressing remote: objects:  93% (14/15)   
remote: Compressing objects: 100% (15/15)   
remote: Compressing objects: 100% (15/15), done.
remote: Total 49 (delta 39), reusremote: ed 44 (delta 34)
From /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
   e315c12..6993fc5  master     -> hrt
remote: Counting objects: 1   
remote: Counting objects: 67, done.
remote: Compressing objects:   2% (1/41)   
remote: Compressing objects:   4% (2/41)   
remote: Compressing objects:   7% (3/41)   
remote: Compressing objects:remote:    9% (4/41)   
remote: Compressing objects:  12% (5/41)   
remote: Compressing objects:  14% (6/41)   
remote: Compressing objects:  17% (7/41)   
remote: Compremote: ressing objects:  19% (8/41)   
remote: Compressing objects:  21% (9/41)   
remote: Compressing objects:  24% (10/41)   
remote: Compressing objects:  2remote: 6% (11/41)   
remote: Compressing objects:  29% (12/41)   
remote: Compressing objects:  31% (13/41)   
remote: Compressing objects:  34% (14/41)   
remote: Comremote: pressing objects:  36% (15/41)   
remote: Compressing objects:  39% (16/41)   
remote: Compressing objects:  41% (17/41)   
remote: Compressing objects:remote:   43% (18/41)   
remote: Compressing objects:  46% (19/41)   
remote: Compressing objects:  48% (20/41)   
remote: Compressing objects:  51% (21/41)   
remote: Compressing objects:  53% (22/41)   
remote: Compressing objects:  56% (23/41)   
remote: Compressing objects:  58% (24/41)   
remote: Compressing objecremote: ts:  60% (25/41)   
remote: Compressing objects:  63% (26/41)   
remote: Compressing objects:  65% (27/41)   
remote: Compressing objects:  68% (28/41) remote:   
remote: Compressing objects:  70% (29/41)   
remote: Compressing objects:  73% (30/41)   
remote: Compressing objects:  75% (31/41)   
remote: Compressing obremote: jects:  78% (32/41)   
remote: Compressing objects:  80% (33/41)   
remote: Compressing objects:  82% (34/41)   
remote: Compressing objects:  85% (35/4remote: 1)   
remote: Compressing objects:  87% (36/41)   
remote: Compressing objects:  90% (37/41)   
remote: Compressing objects:  92% (38/41)   
remote: Compressingremote:  objects:  95% (39/41)   
remote: Compressing objects:  97% (40/41)   
remote: Compressing objects: 100% (41/41)   
remote: Compressing objects: 100% (4remote: 1/41), done.
remote: Total 41 (delta 37), reused 0 (delta 0)
From /pub/scm/linux/kernel/git/dtor/input
   2fd746d..9e7ddf9  master     -> input-devel
warning: too many files, skipping inexact rename detection
remote: Counting objects: 19, done.
remote: Compressing objects:   8% (1/12)   
remote: Compressing objects:  16% (2/12)   
remote: Compressing objects:  25% (3/12)   
remote: Compressing objects:remote:   33% (4/12)   
remote: Compressing objects:  41% (5/12)   
remote: Compressing objects:  50% (6/12)   
remote: Compressing objects:  58% (7/12)   
remote: Compressing objects:remote:   66% (8/12)   
remote: Compressing objects:  75% (9/12)   
remote: Compressing objects:  83% (10/12)   
remote: Compressing objects:  91% (11/12)   
remote: Coremote: mpressing objects: 100% (12/12)   
remote: Compressing objects: 100% (12/12), done.
remote: Total 12 (delta 10), reused 0 (delta 0)
From /pub/scm/linux/kernel/git/shaggy/jfs-2.6
   96b5a46..15732a1  for-linus  -> jfs
warning: too many files, skipping inexact rename detection
Already on "2.6.25-mc5"
Automatic merge failed; fix conflicts and then commit the result.
Already on "2.6.25-mc5"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
remote: Counting objects: 1120, done.
remote: Compressing objects:   1% (1/95)   
remote: Compressing objects:   2% (2/95)   
remote: Compressing objects:   3% (3/95)   
remote: Compressing objects:   4% (4/95)   
remote: Compressing objects:   5% (5/95)   
remote: Compressing objects:   6% (6/95)   
remote: Compressing objects:   7% (7/95)   
remote: Compressing objects:   8% (8/95)   
remote: Compressing objects:remote:    9% (9/95)   
remote: Compressing objects:  10% (10/95)   
remote: Compressing objects:  11% (11/95)   
remote: Compressing objects:  12% (12/95)   
remote: Cremote: ompressing objects:  13% (13/95)   
remote: Compressing objects:  14% (14/95)   
remote: Compressing objects:  15% (15/95)   
remote: Compressing objectremote: s:  16% (16/95)   
remote: Compressing objects:  17% (17/95)   
remote: Compressing objects:  18% (18/95)   
remote: Compressing objects:  20% (19/95)  remote:  
remote: Compressing objects:  21% (20/95)   
remote: Compressing objects:  22% (21/95)   
remote: Compressing objects:  23% (22/95)   
remote: Compressing objremote: ects:  24% (23/95)   
remote: Compressing objects:  25% (24/95)   
remote: Compressing objects:  26% (25/95)   
remote: Compressing objects:  27% (26/95remote: )   
remote: Compressing objects:  28% (27/95)   
remote: Compressing objects:  29% (28/95)   
remote: Compressing objects:  30% (29/95)   
remote: Compressing remote: objects:  31% (30/95)   
remote: Compressing objects:  32% (31/95)   
remote: Compressing objects:  33% (32/95)   
remote: Compressing objects:  34% (33remote: /95)   
remote: Compressing objects:  35% (34/95)   
remote: Compressing objects:  36% (35/95)   
remote: Compressing objects:  37% (36/95)   
remote: Compressiremote: ng objects:  38% (37/95)   
remote: Compressing objects:  40% (38/95)   
remote: Compressing objects:  41% (39/95)   
remote: Compressing objects:  42% remote: (40/95)   
remote: Compressing objects:  43% (41/95)   
remote: Compressing objects:  44% (42/95)   
remote: Compressing objects:  45% (43/95)   
remote: Compreremote: ssing objects:  46% (44/95)   
remote: Compressing objects:  47% (45/95)   
remote: Compressing objects:  48% (46/95)   
remote: Compressing objects:  4remote: 9% (47/95)   
remote: Compressing objects:  50% (48/95)   
remote: Compressing objects:  51% (49/95)   
remote: Compressing objects:  52% (50/95)   
remote: Comremote: pressing objects:  53% (51/95)   
remote: Compressing objects:  54% (52/95)   
remote: Compressing objects:  55% (53/95)   
remote: Compressing objects:remote:   56% (54/95)   
remote: Compressing objects:  57% (55/95)   
remote: Compressing objects:  58% (56/95)   
remote: Compressing objects:  60% (57/95)   
remote: Compressing objects:  61% (58/95)   
remote: Compressing objects:  62% (59/95)   
remote: Compressing objects:  63% (60/95)   
remote: Compressing objecremote: ts:  64% (61/95)   
remote: Compressing objects:  65% (62/95)   
remote: Compressing objects:  66% (63/95)   
remote: Compressing objects:  67% (64/95) remote:   
remote: Compressing objects:  68% (65/95)   
remote: Compressing objects:  69% (66/95)   
remote: Compressing objects:  70% (67/95)   
remote: Compressing obremote: jects:  71% (68/95)   
remote: Compressing objects:  72% (69/95)   
remote: Compressing objects:  73% (70/95)   
remote: Compressing objects:  74% (71/9remote: 5)   
remote: Compressing objects:  75% (72/95)   
remote: Compressing objects:  76% (73/95)   
remote: Compressing objects:  77% (74/95)   
remote: Compressingremote:  objects:  78% (75/95)   
remote: Compressing objects:  80% (76/95)   
remote: Compressing objects:  81% (77/95)   
remote: Compressing objects:  82% (7remote: 8/95)   
remote: Compressing objects:  83% (79/95)   
remote: Compressing objects:  84% (80/95)   
remote: Compressing objects:  85% (81/95)   
remote: Compressremote: ing objects:  86% (82/95)   
remote: Compressing objects:  87% (83/95)   
remote: Compressing objects:  88% (84/95)   
remote: Compressing objects:  89%remote:  (85/95)   
remote: Compressing objects:  90% (86/95)   
remote: Compressing objects:  91% (87/95)   
remote: Compressing objects:  92% (88/95)   
remote: Comprremote: essing objects:  93% (89/95)   
remote: Compressing objects:  94% (90/95)   
remote: Compressing objects:  95% (91/95)   
remote: Compressing objects:  remote: 96% (92/95)   
remote: Compressing objects:  97% (93/95)   
remote: Compressing objects:  98% (94/95)   
remote: Compressing objects: 100% (95/95)   
remote: Coremote: mpressing objects: 100% (95/95), done.
Receiving objects:   0% (1/1030)   
Receiving objects:   1% (11/1030)   
Receiving objects:   2% (21/1030)   
Receiving objects:   3% (31/1030)   
Receiving objects:   4% (42/1030)   
Receiving objects:   5% (52/1030)   
Receiving objects:   6% (62/1030)   
Receiving objects:   7% (73/1030)   
Receiving objects:   8% (83/1030)   
Receiving objects:   9% (93/1030)   
Receiving objects:  10% (103/1030)   
Receiving objects:  11% (114/1030)   
remote: Total 1030 (delta 945), reused 1020 (delta 935)
Receiving objects:  12% (124/1030)   
Receiving objects:  13% (134/1030)   
Receiving objects:  14% (145/1030)   
Receiving objects:  15% (155/1030)   
Receiving objects:  16% (165/1030)   
Receiving objects:  17% (176/1030)   
Receiving objects:  18% (186/1030)   
Receiving objects:  19% (196/1030)   
Receiving objects:  20% (206/1030)   
Receiving objects:  21% (217/1030)   
Receiving objects:  22% (227/1030)   
Receiving objects:  23% (237/1030)   
Receiving objects:  24% (248/1030)   
Receiving objects:  25% (258/1030)   
Receiving objects:  26% (268/1030)   
Receiving objects:  27% (279/1030)   
Receiving objects:  28% (289/1030)   
Receiving objects:  29% (299/1030)   
Receiving objects:  30% (309/1030)   
Receiving objects:  31% (320/1030)   
Receiving objects:  32% (330/1030)   
Receiving objects:  33% (340/1030)   
Receiving objects:  34% (351/1030)   
Receiving objects:  35% (361/1030)   
Receiving objects:  36% (371/1030)   
Receiving objects:  37% (382/1030)   
Receiving objects:  38% (392/1030)   
Receiving objects:  39% (402/1030)   
Receiving objects:  40% (412/1030)   
Receiving objects:  41% (423/1030)   
Receiving objects:  42% (433/1030)   
Receiving objects:  43% (443/1030)   
Receiving objects:  44% (454/1030)   
Receiving objects:  45% (464/1030)   
Receiving objects:  46% (474/1030)   
Receiving objects:  47% (485/1030)   
Receiving objects:  48% (495/1030)   
Receiving objects:  49% (505/1030)   
Receiving objects:  50% (515/1030)   
Receiving objects:  51% (526/1030)   
Receiving objects:  52% (536/1030)   
Receiving objects:  53% (546/1030)   
Receiving objects:  54% (557/1030)   
Receiving objects:  55% (567/1030)   
Receiving objects:  56% (577/1030)   
Receiving objects:  57% (588/1030)   
Receiving objects:  58% (598/1030)   
Receiving objects:  59% (608/1030)   
Receiving objects:  60% (618/1030)   
Receiving objects:  61% (629/1030)   
Receiving objects:  62% (639/1030)   
Receiving objects:  63% (649/1030)   
Receiving objects:  64% (660/1030)   
Receiving objects:  65% (670/1030)   
Receiving objects:  66% (680/1030)   
Receiving objects:  67% (691/1030)   
Receiving objects:  68% (701/1030)   
Receiving objects:  69% (711/1030)   
Receiving objects:  70% (721/1030)   
Receiving objects:  71% (732/1030)   
Receiving objects:  72% (742/1030)   
Receiving objects:  73% (752/1030)   
Receiving objects:  74% (763/1030)   
Receiving objects:  75% (773/1030)   
Receiving objects:  76% (783/1030)   
Receiving objects:  77% (794/1030)   
Receiving objects:  78% (804/1030)   
Receiving objects:  79% (814/1030)   
Receiving objects:  80% (824/1030)   
Receiving objects:  81% (835/1030)   
Receiving objects:  82% (845/1030)   
Receiving objects:  83% (855/1030)   
Receiving objects:  84% (866/1030)   
Receiving objects:  85% (876/1030)   
Receiving objects:  86% (886/1030)   
Receiving objects:  87% (897/1030)   
Receiving objects:  88% (907/1030)   
Receiving objects:  89% (917/1030)   
Receiving objects:  90% (927/1030)   
Receiving objects:  91% (938/1030)   
Receiving objects:  92% (948/1030)   
Receiving objects:  93% (958/1030)   
Receiving objects:  94% (969/1030)   
Receiving objects:  95% (979/1030)   
Receiving objects:  96% (989/1030)   
Receiving objects:  97% (1000/1030)   
Receiving objects:  98% (1010/1030)   
Receiving objects:  99% (1020/1030)   
Receiving objects: 100% (1030/1030)   
Receiving objects: 100% (1030/1030), 184.03 KiB, done.
Resolving deltas:   4% (38/945)   
Resolving deltas:   5% (55/945)   
Resolving deltas:   8% (81/945)   
Resolving deltas:   9% (89/945)   
Resolving deltas:  17% (168/945)   
Resolving deltas:  25% (245/945)   
Resolving deltas:  26% (249/945)   
Resolving deltas:  28% (273/945)   
Resolving deltas:  29% (279/945)   
Resolving deltas:  30% (288/945)   
Resolving deltas:  34% (326/945)   
Resolving deltas:  35% (339/945)   
Resolving deltas:  36% (349/945)   
Resolving deltas:  37% (355/945)   
Resolving deltas:  38% (363/945)   
Resolving deltas:  39% (375/945)   
Resolving deltas:  40% (382/945)   
Resolving deltas:  41% (390/945)   
Resolving deltas:  42% (400/945)   
Resolving deltas:  43% (408/945)   
Resolving deltas:  44% (422/945)   
Resolving deltas:  45% (427/945)   
Resolving deltas:  46% (438/945)   
Resolving deltas:  47% (449/945)   
Resolving deltas:  48% (455/945)   
Resolving deltas:  49% (468/945)   
Resolving deltas:  50% (475/945)   
Resolving deltas:  51% (485/945)   
Resolving deltas:  52% (496/945)   
Resolving deltas:  53% (503/945)   
Resolving deltas:  54% (515/945)   
Resolving deltas:  55% (520/945)   
Resolving deltas:  56% (533/945)   
Resolving deltas:  57% (545/945)   
Resolving deltas:  58% (549/945)   
Resolving deltas:  59% (563/945)   
Resolving deltas:  60% (569/945)   
Resolving deltas:  61% (584/945)   
Resolving deltas:  62% (589/945)   
Resolving deltas:  63% (598/945)   
Resolving deltas:  64% (609/945)   
Resolving deltas:  65% (620/945)   
Resolving deltas:  66% (626/945)   
Resolving deltas:  67% (642/945)   
Resolving deltas:  68% (648/945)   
Resolving deltas:  69% (654/945)   
Resolving deltas:  70% (668/945)   
Resolving deltas:  71% (674/945)   
Resolving deltas:  72% (682/945)   
Resolving deltas:  73% (695/945)   
Resolving deltas:  74% (707/945)   
Resolving deltas:  75% (716/945)   
Resolving deltas:  77% (733/945)   
Resolving deltas:  78% (744/945)   
Resolving deltas:  79% (750/945)   
Resolving deltas:  80% (762/945)   
Resolving deltas:  82% (777/945)   
Resolving deltas:  83% (786/945)   
Resolving deltas:  84% (796/945)   
Resolving deltas:  85% (805/945)   
Resolving deltas:  86% (817/945)   
Resolving deltas:  87% (823/945)   
Resolving deltas:  88% (833/945)   
Resolving deltas:  91% (869/945)   
Resolving deltas:  95% (905/945)   
Resolving deltas:  99% (941/945)   
Resolving deltas: 100% (945/945)   
Resolving deltas: 100% (945/945), completed with 89 local objects.
From /pub/scm/linux/kernel/git/jgarzik/libata-dev
 + 2a65f2a...48feb3c upstream   -> libata-upstream  (forced update)
warning: too many files, skipping inexact rename detection
Already on "2.6.25-mc5"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
Already on "2.6.25-mc5"
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
remote: Counting objects: 16, done.
remote: Compressing objects:  10% (1/10)   
remote: Compressing objects:  20% (2/10)   
remote: Compressing objects:  30% (3/10)   
remote: Compressing objects:  40% (4/10)   
remote: Compressing objects:  50% (5/10)   
remote: Compressing objects:remote:   60% (6/10)   
remote: Compressing objects:  70% (7/10)   
remote: Compressing objects:  80% (8/10)   
remote: Compressing objects:  90% (9/10)   
remote: Compremote: ressing objects: 100% (10/10)   
remote: Compressing objects: 100% (10/10), done.
remote: Total 10 (delta 8), reused 0 (delta 0)
From /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
   f57c093..0e16b71  master     -> ieee1394
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
fatal: The remote end hung up unexpectedly
error: branch 'mips-devel' not found.
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
remote: Counting objects: 674, done.
remote: Compressing objects:   1% (1/77)   
remote: Compressing objects:   2% (2/77)   
remote: Compressing objects:   3% (3/77)   
remote: Compressing objects:   5% (4/77)   
remote: Compressing objects:   6% (5/77)   
remote: Compressing objects:   7% (6/77)   
remote: Compressing objects:   9% (7/77)   
remote: Compressing objects:  10% (8/77)   
remote: Compressing objects:  11% (9/77)   
remote: Compressing objects:  12% (10/77)   
remote: Compressing objects:  14% (11/77)   
remote: Compressing objects:  15% (12/77)   
remote: Compressing objects:  16% (13/77)   
remote: Compressing objects:  18% (14/77)   
remote: Compressing objects:  19% (15/77)   
remote: Compressing objects:  20% (16/77)   
remote: Compressing objects:  22% (17/77)   
remote: Compressing objects:  23% (18/77)   
remote: Compressing objects:  24% (19/77)   
remote: Compressing objects:  25% (20/77)   
remote: Compressing objects:  27% (21/77)   
remote: Compressing objects:  28% (22/77)   
remote: Compressing objects:  29% (23/77)   
remote: Compressing objects:  31% (24/77)   
remote: Compressing objects:  32% (25/77)   
remote: Compressing objects:  33% (26/77)   
remote: Compressing objects:  35% (27/77)   
remote: Compressing objects:  36% (28/77)   
remote: Compressing objects:  37% (29/77)   
remote: Compressing objects:  38% (30/77)   
remote: Compressing objects:  40% (31/77)   
remote: Compressing objects:  41% (32/77)   
remote: Compressing objects:  42% (33/77)   
remote: Compressing objects:  44% (34/77)   
remote: Compressing objects:  45% (35/77)   
remote: Compressing objects:  46% (36/77)   
remote: Compressing objects:  48% (37/77)   
remote: Compressing objects:  49% (38/77)   
remote: Compressing objects:  50% (39/77)   
remote: Compressing objects:  51% (40/77)   
remote: Compressing objects:  53% (41/77)   
remote: Compressing objects:  54% (42/77)   
remote: Compressing objects:  55% (43/77)   
remote: Compressing objects:  57% (44/77)   
remote: Compressing objects:  58% (45/77)   
remote: Compressing objects:  59% (46/77)   
remote: Compressing objects:  61% (47/77)   
remote: Compressing objects:  62% (48/77)   
remote: Compressing objects:  63% (49/77)   
remote: Compressing objects:  64% (50/77)   
remote: Compressing objects:  66% (51/77)   
remote: Compressing objects:  67% (52/77)   
remote: Compressing objects:  68% (53/77)   
remote: Compressing objects:  70% (54/77)   
remote: Compressing objects:  71% (55/77)   
remote: Compressing objects:  72% (56/77)   
remote: Compressing objects:  74% (57/77)   
remote: Compressing objects:  75% (58/77)   
remote: Compressing objects:  76% (59/77)   
remote: Compressing objects:  77% (60/77)   
remote: Compressing objects:  79% (61/77)   
remote: Compressing objects:  80% (62/77)   
remote: Compressing objects:  81% (63/77)   
remote: Compressing objects:  83% (64/77)   
remote: Compressing objects:  84% (65/77)   
remote: Compressing objects:  85% (66/77)   
remote: Compressing objects:  87% (67/77)   
remote: Compressing objects:  88% (68/77)   
remote: Compressing objects:  89% (69/77)   
remote: Compressing objects:  90% (70/77)   
remote: Compressing objects:  92% (71/77)   
remote: Compressing objects:  93% (72/77)   
remote: Compressing objects:  94% (73/77)   
remote: Compressing objects:  96% (74/77)   
remote: Compressing objects:  97% (75/77)   
remote: Compressing objects:  98% (76/77)   
remote: Compressing objects: 100% (77/77)   
remote: Compressing objects: 100% (77/77), done.
Receiving objects:   0% (1/428)   
Receiving objects:   1% (5/428)   
Receiving objects:   2% (9/428)   
Receiving objects:   3% (13/428)   
Receiving objects:   4% (18/428)   
Receiving objects:   5% (22/428)   
Receiving objects:   6% (26/428)   
Receiving objects:   7% (30/428)   
Receiving objects:   8% (35/428)   
Receiving objects:   9% (39/428)   
Receiving objects:  10% (43/428)   
Receiving objects:  11% (48/428)   
Receiving objects:  12% (52/428)   
Receiving objects:  13% (56/428)   
Receiving objects:  14% (60/428)   
Receiving objects:  15% (65/428)   
Receiving objects:  16% (69/428)   
Receiving objects:  17% (73/428)   
Receiving objects:  18% (78/428)   
Receiving objects:  19% (82/428)   
Receiving objects:  20% (86/428)   
Receiving objects:  21% (90/428)   
Receiving objects:  22% (95/428)   
Receiving objects:  23% (99/428)   
Receiving objects:  24% (103/428)   
remote: Total 428 (delta 364), reused 414 (delta 351)
Receiving objects:  25% (107/428)   
Receiving objects:  26% (112/428)   
Receiving objects:  27% (116/428)   
Receiving objects:  28% (120/428)   
Receiving objects:  29% (125/428)   
Receiving objects:  30% (129/428)   
Receiving objects:  31% (133/428)   
Receiving objects:  32% (137/428)   
Receiving objects:  33% (142/428)   
Receiving objects:  34% (146/428)   
Receiving objects:  35% (150/428)   
Receiving objects:  36% (155/428)   
Receiving objects:  37% (159/428)   
Receiving objects:  38% (163/428)   
Receiving objects:  39% (167/428)   
Receiving objects:  40% (172/428)   
Receiving objects:  41% (176/428)   
Receiving objects:  42% (180/428)   
Receiving objects:  43% (185/428)   
Receiving objects:  44% (189/428)   
Receiving objects:  45% (193/428)   
Receiving objects:  46% (197/428)   
Receiving objects:  47% (202/428)   
Receiving objects:  48% (206/428)   
Receiving objects:  49% (210/428)   
Receiving objects:  50% (214/428)   
Receiving objects:  51% (219/428)   
Receiving objects:  52% (223/428)   
Receiving objects:  53% (227/428)   
Receiving objects:  54% (232/428)   
Receiving objects:  55% (236/428)   
Receiving objects:  56% (240/428)   
Receiving objects:  57% (244/428)   
Receiving objects:  58% (249/428)   
Receiving objects:  59% (253/428)   
Receiving objects:  60% (257/428)   
Receiving objects:  61% (262/428)   
Receiving objects:  62% (266/428)   
Receiving objects:  63% (270/428)   
Receiving objects:  64% (274/428)   
Receiving objects:  65% (279/428)   
Receiving objects:  66% (283/428)   
Receiving objects:  67% (287/428)   
Receiving objects:  68% (292/428)   
Receiving objects:  69% (296/428)   
Receiving objects:  70% (300/428)   
Receiving objects:  71% (304/428)   
Receiving objects:  72% (309/428)   
Receiving objects:  73% (313/428)   
Receiving objects:  74% (317/428)   
Receiving objects:  75% (321/428)   
Receiving objects:  76% (326/428)   
Receiving objects:  77% (330/428)   
Receiving objects:  78% (334/428)   
Receiving objects:  79% (339/428)   
Receiving objects:  80% (343/428)   
Receiving objects:  81% (347/428)   
Receiving objects:  82% (351/428)   
Receiving objects:  83% (356/428)   
Receiving objects:  84% (360/428)   
Receiving objects:  85% (364/428)   
Receiving objects:  86% (369/428)   
Receiving objects:  87% (373/428)   
Receiving objects:  88% (377/428)   
Receiving objects:  89% (381/428)   
Receiving objects:  90% (386/428)   
Receiving objects:  91% (390/428)   
Receiving objects:  92% (394/428)   
Receiving objects:  93% (399/428)   
Receiving objects:  94% (403/428)   
Receiving objects:  95% (407/428)   
Receiving objects:  96% (411/428)   
Receiving objects:  97% (416/428)   
Receiving objects:  98% (420/428)   
Receiving objects:  99% (424/428)   
Receiving objects: 100% (428/428)   
Receiving objects: 100% (428/428), 90.28 KiB, done.
Resolving deltas:   0% (1/364)   
Resolving deltas:   1% (4/364)   
Resolving deltas:   3% (13/364)   
Resolving deltas:   4% (15/364)   
Resolving deltas:   5% (19/364)   
Resolving deltas:   6% (22/364)   
Resolving deltas:   7% (27/364)   
Resolving deltas:   8% (30/364)   
Resolving deltas:   9% (33/364)   
Resolving deltas:  10% (37/364)   
Resolving deltas:  11% (41/364)   
Resolving deltas:  12% (46/364)   
Resolving deltas:  13% (50/364)   
Resolving deltas:  14% (51/364)   
Resolving deltas:  15% (55/364)   
Resolving deltas:  16% (59/364)   
Resolving deltas:  17% (62/364)   
Resolving deltas:  18% (66/364)   
Resolving deltas:  19% (70/364)   
Resolving deltas:  20% (73/364)   
Resolving deltas:  21% (80/364)   
Resolving deltas:  22% (81/364)   
Resolving deltas:  23% (85/364)   
Resolving deltas:  24% (88/364)   
Resolving deltas:  25% (91/364)   
Resolving deltas:  26% (95/364)   
Resolving deltas:  27% (101/364)   
Resolving deltas:  28% (102/364)   
Resolving deltas:  29% (107/364)   
Resolving deltas:  31% (114/364)   
Resolving deltas:  32% (117/364)   
Resolving deltas:  33% (121/364)   
Resolving deltas:  34% (124/364)   
Resolving deltas:  35% (128/364)   
Resolving deltas:  37% (136/364)   
Resolving deltas:  39% (144/364)   
Resolving deltas:  40% (149/364)   
Resolving deltas:  41% (151/364)   
Resolving deltas:  42% (153/364)   
Resolving deltas:  43% (160/364)   
Resolving deltas:  44% (161/364)   
Resolving deltas:  45% (167/364)   
Resolving deltas:  46% (171/364)   
Resolving deltas:  47% (172/364)   
Resolving deltas:  48% (175/364)   
Resolving deltas:  49% (179/364)   
Resolving deltas:  50% (182/364)   
Resolving deltas:  51% (188/364)   
Resolving deltas:  52% (190/364)   
Resolving deltas:  53% (193/364)   
Resolving deltas:  54% (197/364)   
Resolving deltas:  55% (201/364)   
Resolving deltas:  56% (205/364)   
Resolving deltas:  57% (208/364)   
Resolving deltas:  58% (212/364)   
Resolving deltas:  59% (215/364)   
Resolving deltas:  73% (267/364)   
Resolving deltas:  87% (317/364)   
Resolving deltas:  98% (359/364)   
Resolving deltas:  99% (362/364)   
Resolving deltas: 100% (364/364)   
Resolving deltas: 100% (364/364), completed with 138 local objects.
From /pub/scm/linux/kernel/git/davem/net-2.6.26
   8c95b47..1e42198  master     -> net
Already on "2.6.25-mc5"
warning: too many files, skipping inexact rename detection
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-mc5"
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
remote: Counting objects: 1   
remote: Counting objects: 150, done.
remote: Compressing objects:   2% (1/34)   
remote: Compressing objects:   5% (2/34)   
remote: Compressing objects:   8% (3/34)   
remote: Compressing objects:  11% (4/34)   
remote: Compressing objects:  14% (5/34)   
remote: Compressing objects:  17% (6/34)   
remote: Compressing objects:  20% (7/34)   
remote: Compressing objects:  23% (8/34)   
remote: Compressing objects:  26% (9/34)   
remote: Compressing objects:  29% (10/34)   
remote: Compressing objects:  32% (11/34)   
remote: Compressing objects:  35% (12/34)   
remote: Compressing objecremote: ts:  38% (13/34)   
remote: Compressing objects:  41% (14/34)   
remote: Compressing objects:  44% (15/34)   
remote: Compressing objects:  47% (16/34) remote:   
remote: Compressing objects:  50% (17/34)   
remote: Compressing objects:  52% (18/34)   
remote: Compressing objects:  55% (19/34)   
remote: Compressing obremote: jects:  58% (20/34)   
remote: Compressing objects:  61% (21/34)   
remote: Compressing objects:  64% (22/34)   
remote: Compressing objects:  67% (23/3remote: 4)   
remote: Compressing objects:  70% (24/34)   
remote: Compressing objects:  73% (25/34)   
remote: Compressing objects:  76% (26/34)   
remote: Compressingremote:  objects:  79% (27/34)   
remote: Compressing objects:  82% (28/34)   
remote: Compressing objects:  85% (29/34)   
remote: Compressing objects:  88% (3remote: 0/34)   
remote: Compressing objects:  91% (31/34)   
remote: Compressing objects:  94% (32/34)   
remote: Compressing objects:  97% (33/34)   
remote: Compressremote: ing objects: 100% (34/34)   
remote: Compressing objects: 100% (34/34), done.
remote: Total 121 (delta 101), reused 105 (delta 87)
Receiving objects:   0% (1/121)   
Receiving objects:   1% (2/121)   
Receiving objects:   2% (3/121)   
Receiving objects:   3% (4/121)   
Receiving objects:   4% (5/121)   
Receiving objects:   5% (7/121)   
Receiving objects:   6% (8/121)   
Receiving objects:   7% (9/121)   
Receiving objects:   8% (10/121)   
Receiving objects:   9% (11/121)   
Receiving objects:  10% (13/121)   
Receiving objects:  11% (14/121)   
Receiving objects:  12% (15/121)   
Receiving objects:  13% (16/121)   
Receiving objects:  14% (17/121)   
Receiving objects:  15% (19/121)   
Receiving objects:  16% (20/121)   
Receiving objects:  17% (21/121)   
Receiving objects:  18% (22/121)   
Receiving objects:  19% (23/121)   
Receiving objects:  20% (25/121)   
Receiving objects:  21% (26/121)   
Receiving objects:  22% (27/121)   
Receiving objects:  23% (28/121)   
Receiving objects:  24% (30/121)   
Receiving objects:  25% (31/121)   
Receiving objects:  26% (32/121)   
Receiving objects:  27% (33/121)   
Receiving objects:  28% (34/121)   
Receiving objects:  29% (36/121)   
Receiving objects:  30% (37/121)   
Receiving objects:  31% (38/121)   
Receiving objects:  32% (39/121)   
Receiving objects:  33% (40/121)   
Receiving objects:  34% (42/121)   
Receiving objects:  35% (43/121)   
Receiving objects:  36% (44/121)   
Receiving objects:  37% (45/121)   
Receiving objects:  38% (46/121)   
Receiving objects:  39% (48/121)   
Receiving objects:  40% (49/121)   
Receiving objects:  41% (50/121)   
Receiving objects:  42% (51/121)   
Receiving objects:  43% (53/121)   
Receiving objects:  44% (54/121)   
Receiving objects:  45% (55/121)   
Receiving objects:  46% (56/121)   
Receiving objects:  47% (57/121)   
Receiving objects:  48% (59/121)   
Receiving objects:  49% (60/121)   
Receiving objects:  50% (61/121)   
Receiving objects:  51% (62/121)   
Receiving objects:  52% (63/121)   
Receiving objects:  53% (65/121)   
Receiving objects:  54% (66/121)   
Receiving objects:  55% (67/121)   
Receiving objects:  56% (68/121)   
Receiving objects:  57% (69/121)   
Receiving objects:  58% (71/121)   
Receiving objects:  59% (72/121)   
Receiving objects:  60% (73/121)   
Receiving objects:  61% (74/121)   
Receiving objects:  62% (76/121)   
Receiving objects:  63% (77/121)   
Receiving objects:  64% (78/121)   
Receiving objects:  65% (79/121)   
Receiving objects:  66% (80/121)   
Receiving objects:  67% (82/121)   
Receiving objects:  68% (83/121)   
Receiving objects:  69% (84/121)   
Receiving objects:  70% (85/121)   
Receiving objects:  71% (86/121)   
Receiving objects:  72% (88/121)   
Receiving objects:  73% (89/121)   
Receiving objects:  74% (90/121)   
Receiving objects:  75% (91/121)   
Receiving objects:  76% (92/121)   
Receiving objects:  77% (94/121)   
Receiving objects:  78% (95/121)   
Receiving objects:  79% (96/121)   
Receiving objects:  80% (97/121)   
Receiving objects:  81% (99/121)   
Receiving objects:  82% (100/121)   
Receiving objects:  83% (101/121)   
Receiving objects:  84% (102/121)   
Receiving objects:  85% (103/121)   
Receiving objects:  86% (105/121)   
Receiving objects:  87% (106/121)   
Receiving objects:  88% (107/121)   
Receiving objects:  89% (108/121)   
Receiving objects:  90% (109/121)   
Receiving objects:  91% (111/121)   
Receiving objects:  92% (112/121)   
Receiving objects:  93% (113/121)   
Receiving objects:  94% (114/121)   
Receiving objects:  95% (115/121)   
Receiving objects:  96% (117/121)   
Receiving objects:  97% (118/121)   
Receiving objects:  98% (119/121)   
Receiving objects:  99% (120/121)   
Receiving objects: 100% (121/121)   
Receiving objects: 100% (121/121), 20.68 KiB, done.
Resolving deltas:   8% (9/101)   
Resolving deltas:  21% (22/101)   
Resolving deltas:  22% (23/101)   
Resolving deltas:  37% (38/101)   
Resolving deltas:  38% (39/101)   
Resolving deltas:  39% (40/101)   
Resolving deltas:  40% (41/101)   
Resolving deltas:  41% (42/101)   
Resolving deltas:  42% (43/101)   
Resolving deltas:  43% (44/101)   
Resolving deltas:  44% (45/101)   
Resolving deltas:  45% (46/101)   
Resolving deltas:  47% (48/101)   
Resolving deltas:  55% (56/101)   
Resolving deltas:  63% (64/101)   
Resolving deltas:  64% (65/101)   
Resolving deltas:  65% (66/101)   
Resolving deltas:  66% (67/101)   
Resolving deltas:  70% (71/101)   
Resolving deltas:  72% (73/101)   
Resolving deltas:  73% (74/101)   
Resolving deltas:  75% (76/101)   
Resolving deltas:  81% (82/101)   
Resolving deltas:  82% (83/101)   
Resolving deltas:  83% (84/101)   
Resolving deltas:  84% (85/101)   
Resolving deltas:  86% (87/101)   
Resolving deltas:  87% (88/101)   
Resolving deltas:  93% (94/101)   
Resolving deltas:  95% (96/101)   
Resolving deltas: 100% (101/101)   
Resolving deltas: 100% (101/101), completed with 28 local objects.
From /pub/scm/linux/kernel/git/jmorris/selinux-2.6
 + 8d22f74...5f46ce1 for-linus  -> selinux-linus  (forced update)
warning: too many files, skipping inexact rename detection
remote: Counting objects: 9, done.
remote: Compressing objects:  50% (1/2)   
remote: Compressing objects: 100% (2/2)   
remote: Compressing objects: 100% (2/2)remote: , done.
remote: Total 5 (delta 3), reused 5 (delta 3)
From /pub/scm/linux/kernel/git/jmorris/selinux-2.6
   f1659af..f777964  for-akpm   -> selinux
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
From /pub/scm/linux/kernel/git/x86/linux-2.6-x86
 + 6361e1e...f194fed master     -> x86  (forced update)
Checking out files:  22% (875/3960)   
Checking out files:  23% (911/3960)   
Checking out files:  24% (951/3960)   
Checking out files:  25% (990/3960)   
Checking out files:  26% (1030/3960)   
Checking out files:  27% (1070/3960)   
Checking out files:  28% (1109/3960)   
Checking out files:  29% (1149/3960)   
Checking out files:  30% (1188/3960)   
Checking out files:  31% (1228/3960)   
Checking out files:  32% (1268/3960)   
Checking out files:  33% (1307/3960)   
Checking out files:  34% (1347/3960)   
Checking out files:  35% (1386/3960)   
Checking out files:  36% (1426/3960)   
Checking out files:  37% (1466/3960)   
Checking out files:  38% (1505/3960)   
Checking out files:  39% (1545/3960)   
Checking out files:  40% (1584/3960)   
Checking out files:  41% (1624/3960)   
Checking out files:  42% (1664/3960)   
Checking out files:  43% (1703/3960)   
Checking out files:  44% (1743/3960)   
Checking out files:  45% (1782/3960)   
Checking out files:  46% (1822/3960)   
Checking out files:  47% (1862/3960)   
Checking out files:  48% (1901/3960)   
Checking out files:  49% (1941/3960)   
Checking out files:  50% (1980/3960)   
Checking out files:  51% (2020/3960)   
Checking out files:  52% (2060/3960)   
Checking out files:  52% (2076/3960)   
Checking out files:  53% (2099/3960)   
Checking out files:  54% (2139/3960)   
Checking out files:  55% (2178/3960)   
Checking out files:  56% (2218/3960)   
Checking out files:  57% (2258/3960)   
Checking out files:  58% (2297/3960)   
Checking out files:  59% (2337/3960)   
Checking out files:  60% (2376/3960)   
Checking out files:  61% (2416/3960)   
Checking out files:  62% (2456/3960)   
Checking out files:  63% (2495/3960)   
Checking out files:  64% (2535/3960)   
Checking out files:  65% (2574/3960)   
Checking out files:  66% (2614/3960)   
Checking out files:  67% (2654/3960)   
Checking out files:  68% (2693/3960)   
Checking out files:  69% (2733/3960)   
Checking out files:  70% (2772/3960)   
Checking out files:  71% (2812/3960)   
Checking out files:  71% (2849/3960)   
Checking out files:  72% (2852/3960)   
Checking out files:  73% (2891/3960)   
Checking out files:  74% (2931/3960)   
Checking out files:  75% (2970/3960)   
Checking out files:  76% (3010/3960)   
Checking out files:  77% (3050/3960)   
Checking out files:  78% (3089/3960)   
Checking out files:  79% (3129/3960)   
Checking out files:  80% (3168/3960)   
Checking out files:  81% (3208/3960)   
Checking out files:  82% (3248/3960)   
Checking out files:  83% (3287/3960)   
Checking out files:  84% (3327/3960)   
Checking out files:  85% (3366/3960)   
Checking out files:  86% (3406/3960)   
Checking out files:  87% (3446/3960)   
Checking out files:  88% (3485/3960)   
Checking out files:  89% (3525/3960)   
Checking out files:  90% (3564/3960)   
Checking out files:  90% (3574/3960)   
Checking out files:  91% (3604/3960)   
Checking out files:  92% (3644/3960)   
Checking out files:  93% (3683/3960)   
Checking out files:  94% (3723/3960)   
Checking out files:  95% (3762/3960)   
Checking out files:  96% (3802/3960)   
Checking out files:  97% (3842/3960)   
Checking out files:  98% (3881/3960)   
Checking out files:  99% (3921/3960)   
Checking out files: 100% (3960/3960)   
Checking out files: 100% (3960/3960), done.
Switched to branch "x86"
Finished one revert.
Checking out files:  18% (743/3959)   
Checking out files:  19% (753/3959)   
Checking out files:  20% (792/3959)   
Checking out files:  21% (832/3959)   
Checking out files:  22% (871/3959)   
Checking out files:  23% (911/3959)   
Checking out files:  24% (951/3959)   
Checking out files:  25% (990/3959)   
Checking out files:  26% (1030/3959)   
Checking out files:  27% (1069/3959)   
Checking out files:  28% (1109/3959)   
Checking out files:  29% (1149/3959)   
Checking out files:  30% (1188/3959)   
Checking out files:  30% (1194/3959)   
Checking out files:  31% (1228/3959)   
Checking out files:  32% (1267/3959)   
Checking out files:  33% (1307/3959)   
Checking out files:  34% (1347/3959)   
Checking out files:  35% (1386/3959)   
Checking out files:  36% (1426/3959)   
Checking out files:  37% (1465/3959)   
Checking out files:  38% (1505/3959)   
Checking out files:  39% (1545/3959)   
Checking out files:  40% (1584/3959)   
Checking out files:  41% (1624/3959)   
Checking out files:  42% (1663/3959)   
Checking out files:  43% (1703/3959)   
Checking out files:  44% (1742/3959)   
Checking out files:  45% (1782/3959)   
Checking out files:  46% (1822/3959)   
Checking out files:  47% (1861/3959)   
Checking out files:  48% (1901/3959)   
Checking out files:  49% (1940/3959)   
Checking out files:  50% (1980/3959)   
Checking out files:  51% (2020/3959)   
Checking out files:  52% (2059/3959)   
Checking out files:  53% (2099/3959)   
Checking out files:  54% (2138/3959)   
Checking out files:  55% (2178/3959)   
Checking out files:  56% (2218/3959)   
Checking out files:  57% (2257/3959)   
Checking out files:  57% (2293/3959)   
Checking out files:  58% (2297/3959)   
Checking out files:  59% (2336/3959)   
Checking out files:  60% (2376/3959)   
Checking out files:  61% (2415/3959)   
Checking out files:  62% (2455/3959)   
Checking out files:  63% (2495/3959)   
Checking out files:  64% (2534/3959)   
Checking out files:  65% (2574/3959)   
Checking out files:  66% (2613/3959)   
Checking out files:  67% (2653/3959)   
Checking out files:  68% (2693/3959)   
Checking out files:  69% (2732/3959)   
Checking out files:  70% (2772/3959)   
Checking out files:  71% (2811/3959)   
Checking out files:  72% (2851/3959)   
Checking out files:  73% (2891/3959)   
Checking out files:  74% (2930/3959)   
Checking out files:  75% (2970/3959)   
Checking out files:  76% (3009/3959)   
Checking out files:  77% (3049/3959)   
Checking out files:  78% (3089/3959)   
Checking out files:  79% (3128/3959)   
Checking out files:  80% (3168/3959)   
Checking out files:  81% (3207/3959)   
Checking out files:  82% (3247/3959)   
Checking out files:  83% (3286/3959)   
Checking out files:  84% (3326/3959)   
Checking out files:  85% (3366/3959)   
Checking out files:  86% (3405/3959)   
Checking out files:  87% (3445/3959)   
Checking out files:  88% (3484/3959)   
Checking out files:  89% (3524/3959)   
Checking out files:  90% (3564/3959)   
Checking out files:  91% (3603/3959)   
Checking out files:  92% (3643/3959)   
Checking out files:  93% (3682/3959)   
Checking out files:  94% (3722/3959)   
Checking out files:  95% (3762/3959)   
Checking out files:  96% (3801/3959)   
Checking out files:  97% (3841/3959)   
Checking out files:  98% (3880/3959)   
Checking out files:  99% (3920/3959)   
Checking out files: 100% (3959/3959)   
Checking out files: 100% (3959/3959), done.
Switched to branch "2.6.25-mc5"
Already on "2.6.25-mc5"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
Already on "2.6.25-mc5"
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:  21% (944/4324)   
Checking out files:  22% (952/4324)   
Checking out files:  23% (995/4324)   
Checking out files:  24% (1038/4324)   
Checking out files:  25% (1081/4324)   
Checking out files:  26% (1125/4324)   
Checking out files:  27% (1168/4324)   
Checking out files:  28% (1211/4324)   
Checking out files:  29% (1254/4324)   
Checking out files:  30% (1298/4324)   
Checking out files:  31% (1341/4324)   
Checking out files:  32% (1384/4324)   
Checking out files:  33% (1427/4324)   
Checking out files:  34% (1471/4324)   
Checking out files:  35% (1514/4324)   
Checking out files:  36% (1557/4324)   
Checking out files:  37% (1600/4324)   
Checking out files:  38% (1644/4324)   
Checking out files:  39% (1687/4324)   
Checking out files:  40% (1730/4324)   
Checking out files:  41% (1773/4324)   
Checking out files:  42% (1817/4324)   
Checking out files:  43% (1860/4324)   
Checking out files:  43% (1897/4324)   
Checking out files:  44% (1903/4324)   
Checking out files:  45% (1946/4324)   
Checking out files:  46% (1990/4324)   
Checking out files:  47% (2033/4324)   
Checking out files:  48% (2076/4324)   
Checking out files:  49% (2119/4324)   
Checking out files:  50% (2162/4324)   
Checking out files:  51% (2206/4324)   
Checking out files:  52% (2249/4324)   
Checking out files:  53% (2292/4324)   
Checking out files:  54% (2335/4324)   
Checking out files:  55% (2379/4324)   
Checking out files:  56% (2422/4324)   
Checking out files:  57% (2465/4324)   
Checking out files:  58% (2508/4324)   
Checking out files:  59% (2552/4324)   
Checking out files:  60% (2595/4324)   
Checking out files:  60% (2608/4324)   
Checking out files:  61% (2638/4324)   
Checking out files:  62% (2681/4324)   
Checking out files:  63% (2725/4324)   
Checking out files:  64% (2768/4324)   
Checking out files:  65% (2811/4324)   
Checking out files:  66% (2854/4324)   
Checking out files:  67% (2898/4324)   
Checking out files:  68% (2941/4324)   
Checking out files:  69% (2984/4324)   
Checking out files:  70% (3027/4324)   
Checking out files:  71% (3071/4324)   
Checking out files:  72% (3114/4324)   
Checking out files:  73% (3157/4324)   
Checking out files:  74% (3200/4324)   
Checking out files:  75% (3243/4324)   
Checking out files:  76% (3287/4324)   
Checking out files:  77% (3330/4324)   
Checking out files:  78% (3373/4324)   
Checking out files:  79% (3416/4324)   
Checking out files:  80% (3460/4324)   
Checking out files:  81% (3503/4324)   
Checking out files:  82% (3546/4324)   
Checking out files:  83% (3589/4324)   
Checking out files:  84% (3633/4324)   
Checking out files:  85% (3676/4324)   
Checking out files:  86% (3719/4324)   
Checking out files:  87% (3762/4324)   
Checking out files:  88% (3806/4324)   
Checking out files:  89% (3849/4324)   
Checking out files:  90% (3892/4324)   
Checking out files:  91% (3935/4324)   
Checking out files:  92% (3979/4324)   
Checking out files:  93% (4022/4324)   
Checking out files:  94% (4065/4324)   
Checking out files:  95% (4108/4324)   
Checking out files:  95% (4114/4324)   
Checking out files:  96% (4152/4324)   
Checking out files:  97% (4195/4324)   
Checking out files:  98% (4238/4324)   
Checking out files:  99% (4281/4324)   
Checking out files: 100% (4324/4324)   
Checking out files: 100% (4324/4324), done.
Switched to branch "doc"
Checking out files:  37% (1639/4334)   
Checking out files:  38% (1647/4334)   
Checking out files:  39% (1691/4334)   
Checking out files:  40% (1734/4334)   
Checking out files:  41% (1777/4334)   
Checking out files:  42% (1821/4334)   
Checking out files:  43% (1864/4334)   
Checking out files:  44% (1907/4334)   
Checking out files:  45% (1951/4334)   
Checking out files:  46% (1994/4334)   
Checking out files:  47% (2037/4334)   
Checking out files:  48% (2081/4334)   
Checking out files:  49% (2124/4334)   
Checking out files:  49% (2157/4334)   
Checking out files:  50% (2167/4334)   
Checking out files:  51% (2211/4334)   
Checking out files:  52% (2254/4334)   
Checking out files:  53% (2298/4334)   
Checking out files:  54% (2341/4334)   
Checking out files:  55% (2384/4334)   
Checking out files:  56% (2428/4334)   
Checking out files:  57% (2471/4334)   
Checking out files:  58% (2514/4334)   
Checking out files:  59% (2558/4334)   
Checking out files:  60% (2601/4334)   
Checking out files:  61% (2644/4334)   
Checking out files:  62% (2688/4334)   
Checking out files:  63% (2731/4334)   
Checking out files:  64% (2774/4334)   
Checking out files:  65% (2818/4334)   
Checking out files:  66% (2861/4334)   
Checking out files:  67% (2904/4334)   
Checking out files:  68% (2948/4334)   
Checking out files:  69% (2991/4334)   
Checking out files:  70% (3034/4334)   
Checking out files:  71% (3078/4334)   
Checking out files:  72% (3121/4334)   
Checking out files:  73% (3164/4334)   
Checking out files:  74% (3208/4334)   
Checking out files:  75% (3251/4334)   
Checking out files:  76% (3294/4334)   
Checking out files:  77% (3338/4334)   
Checking out files:  78% (3381/4334)   
Checking out files:  79% (3424/4334)   
Checking out files:  80% (3468/4334)   
Checking out files:  81% (3511/4334)   
Checking out files:  82% (3554/4334)   
Checking out files:  82% (3563/4334)   
Checking out files:  83% (3598/4334)   
Checking out files:  84% (3641/4334)   
Checking out files:  85% (3684/4334)   
Checking out files:  86% (3728/4334)   
Checking out files:  87% (3771/4334)   
Checking out files:  88% (3814/4334)   
Checking out files:  89% (3858/4334)   
Checking out files:  90% (3901/4334)   
Checking out files:  91% (3944/4334)   
Checking out files:  92% (3988/4334)   
Checking out files:  93% (4031/4334)   
Checking out files:  94% (4074/4334)   
Checking out files:  95% (4118/4334)   
Checking out files:  96% (4161/4334)   
Checking out files:  97% (4204/4334)   
Checking out files:  98% (4248/4334)   
Checking out files:  99% (4291/4334)   
Checking out files: 100% (4334/4334)   
Checking out files: 100% (4334/4334), done.
Switched to branch "2.6.25-mc5"
Already on "2.6.25-mc5"
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
remote: Counting objects: 57, done.
remote: Compressing objects:   3% (1/32)   
remote: Compressing objects:   6% (2/32)   
remote: Compressing objects:   9% (3/32)   
remote: Compressing objects:  12% (4/32)   
remote: Compressing objects:  15% (5/32)   
remote: Compressing objects:  18% (6/32)   
remote: Compressing objects:  21% (7/32)   
remote: Compressing objects:  25% (8/32)   
remote: Compressing objects:  28% (9/32)   
remote: Compressing objects:  31% (10/32)   
remote: Compressing objects:  34% (11/32)   
remote: Compressing objects:  37% (12/32)   
remote: Compressing objects:  40% (13/32)   
remote: Compressing objects:  43% (14/32)   
remote: Compressing objects:  46% (15/32)   
remote: Compressing objects:  50% (16/32)   
remote: Compressing objects:  53% (17/32)   
remote: Compressing objects:  56% (18/32)   
remote: Compressing objects:  59% (19/32)   
remote: Compressing objects:  62% (20/32)   
remote: Compressing objects:  65% (21/32)   
remote: Compressing objects:  68% (22/32)   
remote: Compressing objects:  71% (23/32)   
remote: Compressing objects:  75% (24/32)   
remote: Compressing objects:  78% (25/32)   
remote: Compressing objects:  81% (26/32)   
remote: Compressing objects:  84% (27/32)   
remote: Compressing objects:  87% (28/32)   
remote: Compressing objects:  90% (29/32)   
remote: Compressing objects:  93% (30/32)   
remote: Compressing objects:  96% (31/32)   
remote: Compressing objects: 100% (32/32)   
remote: Compressing objects: 100% (32/32), done.
remote: Total 41 (delta 32), reused 12 (delta 9)
From git://git.infradead.org/~dedekind/ubi-2.6
   4b119e2..cbd8a9d  master     -> ubi
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
Checking out files:   1% (65/4064)   
Checking out files:   2% (82/4064)   
Checking out files:   3% (122/4064)   
Checking out files:   4% (163/4064)   
Checking out files:   5% (204/4064)   
Checking out files:   5% (205/4064)   
Checking out files:   6% (244/4064)   
Checking out files:   7% (285/4064)   
Checking out files:   8% (326/4064)   
Checking out files:   8% (336/4064)   
Checking out files:   9% (366/4064)   
Checking out files:  10% (407/4064)   
Checking out files:  11% (448/4064)   
Checking out files:  11% (474/4064)   
Checking out files:  12% (488/4064)   
Checking out files:  13% (529/4064)   
Checking out files:  14% (569/4064)   
Checking out files:  14% (583/4064)   
Checking out files:  15% (610/4064)   
Checking out files:  16% (651/4064)   
Checking out files:  17% (691/4064)   
Checking out files:  17% (693/4064)   
Checking out files:  18% (732/4064)   
Checking out files:  19% (773/4064)   
Checking out files:  20% (813/4064)   
Checking out files:  20% (819/4064)   
Checking out files:  21% (854/4064)   
Checking out files:  22% (895/4064)   
Checking out files:  22% (917/4064)   
Checking out files:  23% (935/4064)   
Checking out files:  24% (976/4064)   
Checking out files:  24% (1011/4064)   
Checking out files:  25% (1016/4064)   
Checking out files:  26% (1057/4064)   
Checking out files:  26% (1064/4064)   
Checking out files:  27% (1098/4064)   
Checking out files:  28% (1138/4064)   
Checking out files:  28% (1156/4064)   
Checking out files:  29% (1179/4064)   
Checking out files:  29% (1207/4064)   
Checking out files:  30% (1220/4064)   
Checking out files:  31% (1260/4064)   
Checking out files:  31% (1278/4064)   
Checking out files:  32% (1301/4064)   
Checking out files:  33% (1342/4064)   
Checking out files:  33% (1349/4064)   
Checking out files:  34% (1382/4064)   
Checking out files:  35% (1423/4064)   
Checking out files:  36% (1464/4064)   
Checking out files:  36% (1465/4064)   
Checking out files:  37% (1504/4064)   
Checking out files:  38% (1545/4064)   
Checking out files:  39% (1585/4064)   
Checking out files:  39% (1606/4064)   
Checking out files:  40% (1626/4064)   
Checking out files:  41% (1667/4064)   
Checking out files:  41% (1672/4064)   
Checking out files:  42% (1707/4064)   
Checking out files:  43% (1748/4064)   
Checking out files:  43% (1751/4064)   
Checking out files:  44% (1789/4064)   
Checking out files:  44% (1823/4064)   
Checking out files:  45% (1829/4064)   
Checking out files:  45% (1866/4064)   
Checking out files:  46% (1870/4064)   
Checking out files:  47% (1911/4064)   
Checking out files:  47% (1921/4064)   
Checking out files:  48% (1951/4064)   
Checking out files:  49% (1992/4064)   
Checking out files:  49% (2027/4064)   
Checking out files:  50% (2032/4064)   
Checking out files:  51% (2073/4064)   
Checking out files:  52% (2114/4064)   
Checking out files:  53% (2154/4064)   
Checking out files:  53% (2177/4064)   
Checking out files:  54% (2195/4064)   
Checking out files:  55% (2236/4064)   
Checking out files:  56% (2276/4064)   
Checking out files:  56% (2277/4064)   
Checking out files:  57% (2317/4064)   
Checking out files:  58% (2358/4064)   
Checking out files:  58% (2360/4064)   
Checking out files:  59% (2398/4064)   
Checking out files:  59% (2432/4064)   
Checking out files:  60% (2439/4064)   
Checking out files:  61% (2480/4064)   
Checking out files:  61% (2502/4064)   
Checking out files:  62% (2520/4064)   
Checking out files:  63% (2561/4064)   
Checking out files:  64% (2601/4064)   
Checking out files:  65% (2642/4064)   
Checking out files:  66% (2683/4064)   
Checking out files:  67% (2723/4064)   
Checking out files:  67% (2754/4064)   
Checking out files:  68% (2764/4064)   
Checking out files:  69% (2805/4064)   
Checking out files:  70% (2845/4064)   
Checking out files:  71% (2886/4064)   
Checking out files:  71% (2888/4064)   
Checking out files:  72% (2927/4064)   
Checking out files:  73% (2967/4064)   
Checking out files:  74% (3008/4064)   
Checking out files:  75% (3048/4064)   
Checking out files:  76% (3089/4064)   
Checking out files:  77% (3130/4064)   
Checking out files:  78% (3170/4064)   
Checking out files:  79% (3211/4064)   
Checking out files:  80% (3252/4064)   
Checking out files:  81% (3292/4064)   
Checking out files:  82% (3333/4064)   
Checking out files:  83% (3374/4064)   
Checking out files:  84% (3414/4064)   
Checking out files:  84% (3426/4064)   
Checking out files:  85% (3455/4064)   
Checking out files:  86% (3496/4064)   
Checking out files:  87% (3536/4064)   
Checking out files:  88% (3577/4064)   
Checking out files:  89% (3617/4064)   
Checking out files:  90% (3658/4064)   
Checking out files:  90% (3676/4064)   
Checking out files:  91% (3699/4064)   
Checking out files:  92% (3739/4064)   
Checking out files:  93% (3780/4064)   
Checking out files:  94% (3821/4064)   
Checking out files:  95% (3861/4064)   
Checking out files:  95% (3863/4064)   
Checking out files:  96% (3902/4064)   
Checking out files:  97% (3943/4064)   
Checking out files:  98% (3983/4064)   
Checking out files:  99% (4024/4064)   
Checking out files:  99% (4047/4064)   
Checking out files: 100% (4064/4064)   
Checking out files: 100% (4064/4064), 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:  29% (1246/4168)   
Checking out files:  30% (1251/4168)   
Checking out files:  31% (1293/4168)   
Checking out files:  32% (1334/4168)   
Checking out files:  33% (1376/4168)   
Checking out files:  34% (1418/4168)   
Checking out files:  35% (1459/4168)   
Checking out files:  36% (1501/4168)   
Checking out files:  37% (1543/4168)   
Checking out files:  38% (1584/4168)   
Checking out files:  39% (1626/4168)   
Checking out files:  40% (1668/4168)   
Checking out files:  41% (1709/4168)   
Checking out files:  42% (1751/4168)   
Checking out files:  43% (1793/4168)   
Checking out files:  44% (1834/4168)   
Checking out files:  44% (1863/4168)   
Checking out files:  45% (1876/4168)   
Checking out files:  46% (1918/4168)   
Checking out files:  47% (1959/4168)   
Checking out files:  48% (2001/4168)   
Checking out files:  49% (2043/4168)   
Checking out files:  50% (2084/4168)   
Checking out files:  51% (2126/4168)   
Checking out files:  52% (2168/4168)   
Checking out files:  53% (2210/4168)   
Checking out files:  54% (2251/4168)   
Checking out files:  55% (2293/4168)   
Checking out files:  56% (2335/4168)   
Checking out files:  57% (2376/4168)   
Checking out files:  58% (2418/4168)   
Checking out files:  58% (2440/4168)   
Checking out files:  59% (2460/4168)   
Checking out files:  60% (2501/4168)   
Checking out files:  61% (2543/4168)   
Checking out files:  62% (2585/4168)   
Checking out files:  63% (2626/4168)   
Checking out files:  64% (2668/4168)   
Checking out files:  65% (2710/4168)   
Checking out files:  66% (2751/4168)   
Checking out files:  67% (2793/4168)   
Checking out files:  68% (2835/4168)   
Checking out files:  69% (2876/4168)   
Checking out files:  70% (2918/4168)   
Checking out files:  71% (2960/4168)   
Checking out files:  72% (3001/4168)   
Checking out files:  72% (3041/4168)   
Checking out files:  73% (3043/4168)   
Checking out files:  74% (3085/4168)   
Checking out files:  75% (3126/4168)   
Checking out files:  76% (3168/4168)   
Checking out files:  77% (3210/4168)   
Checking out files:  78% (3252/4168)   
Checking out files:  79% (3293/4168)   
Checking out files:  80% (3335/4168)   
Checking out files:  81% (3377/4168)   
Checking out files:  82% (3418/4168)   
Checking out files:  83% (3460/4168)   
Checking out files:  84% (3502/4168)   
Checking out files:  85% (3543/4168)   
Checking out files:  86% (3585/4168)   
Checking out files:  87% (3627/4168)   
Checking out files:  88% (3668/4168)   
Checking out files:  89% (3710/4168)   
Checking out files:  90% (3752/4168)   
Checking out files:  91% (3793/4168)   
Checking out files:  92% (3835/4168)   
Checking out files:  93% (3877/4168)   
Checking out files:  94% (3918/4168)   
Checking out files:  95% (3960/4168)   
Checking out files:  96% (4002/4168)   
Checking out files:  97% (4043/4168)   
Checking out files:  98% (4085/4168)   
Checking out files:  99% (4127/4168)   
Checking out files: 100% (4168/4168)   
Checking out files: 100% (4168/4168), done.
Switched to branch "2.6.25-mc5"
Already on "2.6.25-mc5"
warning: too many files, skipping inexact rename detection
Already on "2.6.25-mc5"
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
Already on "2.6.25-mc5"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
remote: Counting objects: 196, done.
remote: Compressing objects:   0% (1/143)   
remote: Compressing objects:   1% (2/143)   
remote: Compressing objects:   2% (3/143)   
remote: Compressing objects:   3% (5/143)   
remote: Compressing objects:   4% (6/143)   
remote: Compressing objects:   5% (8/143)   
remote: Compressing objects:   6% (9/143)   
remote: Compressing objects:   7% (11/143)   
remote: Compressing objects:   8% (12/143)   
remote: Compressing objects:   9% (13/143)   
remote: Compressing objects:  10% (15/143)   
remote: Compressing objects:  11% (16/143)   
remote: Compressing objects:  12% (18/143)   
remote: Compressing objects:  13% (19/143)   
remote: Compressing objects:  14% (21/143)   
remote: Compressing objects:  15% (22/143)   
remote: Compressing objects:  16% (23/143)   
remote: Compressing objects:  17% (25/143)   
remote: Compressing objects:  18% (26/143)   
remote: Compressing objects:  19% (28/143)   
remote: Compressing objects:  20% (29/143)   
remote: Compressing objects:  21% (31/143)   
remote: Compressing objects:  22% (32/143)   
remote: Compressing objects:  23% (33/143)   
remote: Compressing objects:  24% (35/143)   
remote: Compressing objects:  25% (36/143)   
remote: Compressing objects:  26% (38/143)   
remote: Compressing objects:  27% (39/143)   
remote: Compressing objects:  28% (41/143)   
remote: Compressing objects:  29% (42/143)   
remote: Compressing objects:  30% (43/143)   
remote: Compressing objects:  31% (45/143)   
remote: Compressing objects:  32% (46/143)   
remote: Compressing objects:  33% (48/143)   
remote: Compressing objects:  34% (49/143)   
remote: Compressing objects:  35% (51/143)   
remote: Compressing objects:  36% (52/143)   
remote: Compressing objects:  37% (53/143)   
remote: Compressing objects:  38% (55/143)   
remote: Compressing objects:  39% (56/143)   
remote: Compressing objects:  40% (58/143)   
remote: Compressing objects:  41% (59/143)   
remote: Compressing objects:  42% (61/143)   
remote: Compressing objects:  43% (62/143)   
remote: Compressing objects:  44% (63/143)   
remote: Compressing objects:  45% (65/143)   
remote: Compressing objects:  46% (66/143)   
remote: Compressing objects:  47% (68/143)   
remote: Compressing objects:  48% (69/143)   
remote: Compressing objects:  49% (71/143)   
remote: Compressing objects:  50% (72/143)   
remote: Compressing objects:  51% (73/143)   
remote: Compressing objects:  52% (75/143)   
remote: Compressing objects:  53% (76/143)   
remote: Compressing objects:  54% (78/143)   
remote: Compressing objects:  55% (79/143)   
remote: Compressing objects:  56% (81/143)   
remote: Compressing objects:  57% (82/143)   
remote: Compressing objects:  58% (83/143)   
remote: Compressing objects:  59% (85/143)   
remote: Compressing objects:  60% (86/143)   
remote: Compressing objects:  61% (88/143)   
remote: Compressing objects:  62% (89/143)   
remote: Compressing objects:  63% (91/143)   
remote: Compressing objects:  64% (92/143)   
remote: Compressing objects:  65% (93/143)   
remote: Compressing objects:  66% (95/143)   
remote: Compressing objects:  67% (96/143)   
remote: Compressing objects:  68% (98/143)   
remote: Compressing objects:  69% (99/143)   
remote: Compressing objects:  70% (101/143)   
remote: Compressing objects:  71% (102/143)   
remote: Compressing objects:  72% (103/143)   
remote: Compressing objects:  73% (105/143)   
remote: Compressing objects:  74% (106/143)   
remote: Compressing objects:  75% (108/143)   
remote: Compressing objects:  76% (109/143)   
remote: Compressing objects:  77% (111/143)   
remote: Compressing objects:  78% (112/143)   
remote: Compressing objects:  79% (113/143)   
remote: Compressing objects:  80% (115/143)   
remote: Compressing objects:  81% (116/143)   
remote: Compressing objects:  82% (118/143)   
remote: Compressing objects:  83% (119/143)   
remote: Compressing objects:  84% (121/143)   
remote: Compressing objects:  85% (122/143)   
remote: Compressing objects:  86% (123/143)   
remote: Compressing objects:  87% (125/143)   
remote: Compressing objects:  88% (126/143)   
remote: Compressing objects:  89% (128/143)   
remote: Compressing objects:  90% (129/143)   
remote: Compressing objects:  91% (131/143)   
remote: Compressing objects:  92% (132/143)   
remote: Compressing objects:  93% (133/143)   
remote: Compressing objects:  94% (135/143)   
remote: Compressing objects:  95% (136/143)   
remote: Compressing objects:  96% (138/143)   
remote: Compressing objects:  97% (139/143)   
remote: Compressing objects:  98% (141/143)   
remote: Compressing objects:  99% (142/143)   
remote: Compressing objects: 100% (143/143)   
remote: Compressing objects: 100% (143/143), done.
Receiving objects:   0% (1/143)   
Receiving objects:   1% (2/143)   
Receiving objects:   2% (3/143)   
Receiving objects:   3% (5/143)   
Receiving objects:   4% (6/143)   
Receiving objects:   5% (8/143)   
Receiving objects:   6% (9/143)   
Receiving objects:   7% (11/143)   
Receiving objects:   8% (12/143)   
Receiving objects:   9% (13/143)   
Receiving objects:  10% (15/143)   
Receiving objects:  11% (16/143)   
Receiving objects:  12% (18/143)   
Receiving objects:  13% (19/143)   
Receiving objects:  14% (21/143)   
Receiving objects:  15% (22/143)   
Receiving objects:  16% (23/143)   
Receiving objects:  17% (25/143)   
Receiving objects:  18% (26/143)   
Receiving objects:  19% (28/143)   
Receiving objects:  20% (29/143)   
Receiving objects:  21% (31/143)   
Receiving objects:  22% (32/143)   
Receiving objects:  23% (33/143)   
Receiving objects:  24% (35/143)   
Receiving objects:  25% (36/143)   
Receiving objects:  26% (38/143)   
Receiving objects:  27% (39/143)   
Receiving objects:  28% (41/143)   
Receiving objects:  29% (42/143)   
Receiving objects:  30% (43/143)   
Receiving objects:  31% (45/143)   
Receiving objects:  32% (46/143)   
Receiving objects:  33% (48/143)   
Receiving objects:  34% (49/143)   
Receiving objects:  35% (51/143)   
Receiving objects:  36% (52/143)   
Receiving objects:  37% (53/143)   
Receiving objects:  38% (55/143)   
Receiving objects:  39% (56/143)   
Receiving objects:  40% (58/143)   
Receiving objects:  41% (59/143)   
Receiving objects:  42% (61/143)   
remote: Total 143 (delta 117), reused 0 (delta 0)
Receiving objects:  43% (62/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  44% (63/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  45% (65/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  46% (66/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  47% (68/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  48% (69/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  49% (71/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  50% (72/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  51% (73/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  52% (75/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  53% (76/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  54% (78/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  55% (79/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  56% (81/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  57% (82/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  58% (83/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  59% (85/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  60% (86/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  61% (88/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  62% (89/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  63% (91/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  64% (92/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  65% (93/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  66% (95/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  67% (96/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  68% (98/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  69% (99/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  70% (101/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  71% (102/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  72% (103/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  73% (105/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  74% (106/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  75% (108/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  76% (109/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  77% (111/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  78% (112/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  79% (113/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  80% (115/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  81% (116/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  82% (118/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  83% (119/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  84% (121/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  85% (122/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  86% (123/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  87% (125/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  88% (126/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  89% (128/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  90% (129/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  91% (131/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  92% (132/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  93% (133/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  94% (135/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  95% (136/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  96% (138/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  97% (139/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  98% (141/143), 51.99 KiB | 85 KiB/s   
Receiving objects:  99% (142/143), 51.99 KiB | 85 KiB/s   
Receiving objects: 100% (143/143), 51.99 KiB | 85 KiB/s   
Receiving objects: 100% (143/143), 86.19 KiB | 85 KiB/s, done.
Resolving deltas:   0% (1/117)   
Resolving deltas:   2% (3/117)   
Resolving deltas:   3% (4/117)   
Resolving deltas:   4% (5/117)   
Resolving deltas:   5% (6/117)   
Resolving deltas:   7% (9/117)   
Resolving deltas:  24% (29/117)   
Resolving deltas:  28% (33/117)   
Resolving deltas:  30% (36/117)   
Resolving deltas:  32% (38/117)   
Resolving deltas:  33% (39/117)   
Resolving deltas:  34% (40/117)   
Resolving deltas:  35% (41/117)   
Resolving deltas:  36% (43/117)   
Resolving deltas:  37% (44/117)   
Resolving deltas:  49% (58/117)   
Resolving deltas:  52% (61/117)   
Resolving deltas:  54% (64/117)   
Resolving deltas:  55% (65/117)   
Resolving deltas:  56% (66/117)   
Resolving deltas:  57% (67/117)   
Resolving deltas:  58% (68/117)   
Resolving deltas:  59% (70/117)   
Resolving deltas:  60% (71/117)   
Resolving deltas:  61% (72/117)   
Resolving deltas:  62% (73/117)   
Resolving deltas:  63% (74/117)   
Resolving deltas:  64% (75/117)   
Resolving deltas:  65% (77/117)   
Resolving deltas:  66% (78/117)   
Resolving deltas:  67% (79/117)   
Resolving deltas:  68% (80/117)   
Resolving deltas:  70% (82/117)   
Resolving deltas:  71% (84/117)   
Resolving deltas:  72% (85/117)   
Resolving deltas:  73% (86/117)   
Resolving deltas:  77% (91/117)   
Resolving deltas:  78% (92/117)   
Resolving deltas:  79% (93/117)   
Resolving deltas:  80% (94/117)   
Resolving deltas:  81% (95/117)   
Resolving deltas:  84% (99/117)   
Resolving deltas:  85% (100/117)   
Resolving deltas:  86% (101/117)   
Resolving deltas:  87% (102/117)   
Resolving deltas:  89% (105/117)   
Resolving deltas:  92% (108/117)   
Resolving deltas:  93% (109/117)   
Resolving deltas:  94% (111/117)   
Resolving deltas:  95% (112/117)   
Resolving deltas:  96% (113/117)   
Resolving deltas:  97% (114/117)   
Resolving deltas:  98% (115/117)   
Resolving deltas: 100% (117/117)   
Resolving deltas: 100% (117/117), completed with 52 local objects.
From git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6
 * [new branch]      master     -> crypto
warning: too many files, skipping inexact rename detection
remote: Counting objects: 309, done.
remote: Compressing objects:   2% (1/36)   
remote: Compressing objects:   5% (2/36)   
remote: Compressing objects:   8% (3/36)   
remote: Compressing objects:  11% (4/36)   
remote: Compressing objects:  13% (5/36)   
remote: Compressing objects:  16% (6/36)   
remote: Compressing objects:  19% (7/36)   
remote: Compressing objects:  22% (8/36)   
remote: Compressing objects:  25% (9/36)   
remote: Compressing objects:  27% (10/36)   
remote: Compressing objects:  30% (11/36)   
remote: Compressing objects:  33% (12/36)   
remote: Compressing objects:  36% (13/36)   
remote: Compressing objects:  38% (14/36)   
remote: Compressing objects:  41% (15/36)   
remote: Compressing objects:  44% (16/36)   
remote: Compressing objects:  47% (17/36)   
remote: Compressing objects:  50% (18/36)   
remote: Compressing objects:  52% (19/36)   
remote: Compressing objects:  55% (20/36)   
remote: Compressing objects:  58% (21/36)   
remote: Compressing objects:  61% (22/36)   
remote: Compressing objects:  63% (23/36)   
remote: Compressing objects:  66% (24/36)   
remote: Compressing objects:  69% (25/36)   
remote: Compressing objects:  72% (26/36)   
remote: Compressing objects:  75% (27/36)   
remote: Compressing objects:  77% (28/36)   
remote: Compressing objects:  80% (29/36)   
remote: Compressing objects:  83% (30/36)   
remote: Compressing objects:  86% (31/36)   
remote: Compressing objects:  88% (32/36)   
remote: Compressing objects:  91% (33/36)   
remote: Compressing objects:  94% (34/36)   
remote: Compressing objects:  97% (35/36)   
remote: Compressing objects: 100% (36/36)   
remote: Compressing objects: 100% (36/36), done.
Receiving objects:   0% (1/184)   
Receiving objects:   1% (2/184)   
Receiving objects:   2% (4/184)   
Receiving objects:   3% (6/184)   
Receiving objects:   4% (8/184)   
Receiving objects:   5% (10/184)   
Receiving objects:   6% (12/184)   
Receiving objects:   7% (13/184)   
Receiving objects:   8% (15/184)   
Receiving objects:   9% (17/184)   
Receiving objects:  10% (19/184)   
Receiving objects:  11% (21/184)   
Receiving objects:  12% (23/184)   
Receiving objects:  13% (24/184)   
Receiving objects:  14% (26/184)   
Receiving objects:  15% (28/184)   
Receiving objects:  16% (30/184)   
Receiving objects:  17% (32/184)   
Receiving objects:  18% (34/184)   
Receiving objects:  19% (35/184)   
Receiving objects:  20% (37/184)   
Receiving objects:  21% (39/184)   
Receiving objects:  22% (41/184)   
Receiving objects:  23% (43/184)   
Receiving objects:  24% (45/184)   
Receiving objects:  25% (46/184)   
Receiving objects:  26% (48/184)   
Receiving objects:  27% (50/184)   
Receiving objects:  28% (52/184)   
Receiving objects:  29% (54/184)   
Receiving objects:  30% (56/184)   
Receiving objects:  31% (58/184)   
Receiving objects:  32% (59/184)   
Receiving objects:  33% (61/184)   
Receiving objects:  34% (63/184)   
Receiving objects:  35% (65/184)   
Receiving objects:  36% (67/184)   
Receiving objects:  37% (69/184)   
Receiving objects:  38% (70/184)   
Receiving objects:  39% (72/184)   
Receiving objects:  40% (74/184)   
Receiving objects:  41% (76/184)   
Receiving objects:  42% (78/184)   
Receiving objects:  43% (80/184)   
Receiving objects:  44% (81/184)   
Receiving objects:  45% (83/184)   
Receiving objects:  46% (85/184)   
Receiving objects:  47% (87/184)   
remote: Total 184 (delta 154), reused 176 (delta 147)
Receiving objects:  48% (89/184)   
Receiving objects:  49% (91/184)   
Receiving objects:  50% (92/184)   
Receiving objects:  51% (94/184)   
Receiving objects:  52% (96/184)   
Receiving objects:  53% (98/184)   
Receiving objects:  54% (100/184)   
Receiving objects:  55% (102/184)   
Receiving objects:  56% (104/184)   
Receiving objects:  57% (105/184)   
Receiving objects:  58% (107/184)   
Receiving objects:  59% (109/184)   
Receiving objects:  60% (111/184)   
Receiving objects:  61% (113/184)   
Receiving objects:  62% (115/184)   
Receiving objects:  63% (116/184)   
Receiving objects:  64% (118/184)   
Receiving objects:  65% (120/184)   
Receiving objects:  66% (122/184)   
Receiving objects:  67% (124/184)   
Receiving objects:  68% (126/184)   
Receiving objects:  69% (127/184)   
Receiving objects:  70% (129/184)   
Receiving objects:  71% (131/184)   
Receiving objects:  72% (133/184)   
Receiving objects:  73% (135/184)   
Receiving objects:  74% (137/184)   
Receiving objects:  75% (138/184)   
Receiving objects:  76% (140/184)   
Receiving objects:  77% (142/184)   
Receiving objects:  78% (144/184)   
Receiving objects:  79% (146/184)   
Receiving objects:  80% (148/184)   
Receiving objects:  81% (150/184)   
Receiving objects:  82% (151/184)   
Receiving objects:  83% (153/184)   
Receiving objects:  84% (155/184)   
Receiving objects:  85% (157/184)   
Receiving objects:  86% (159/184)   
Receiving objects:  87% (161/184)   
Receiving objects:  88% (162/184)   
Receiving objects:  89% (164/184)   
Receiving objects:  90% (166/184)   
Receiving objects:  91% (168/184)   
Receiving objects:  92% (170/184)   
Receiving objects:  93% (172/184)   
Receiving objects:  94% (173/184)   
Receiving objects:  95% (175/184)   
Receiving objects:  96% (177/184)   
Receiving objects:  97% (179/184)   
Receiving objects:  98% (181/184)   
Receiving objects:  99% (183/184)   
Receiving objects: 100% (184/184)   
Receiving objects: 100% (184/184), 28.82 KiB, done.
Resolving deltas:   2% (4/154)   
Resolving deltas:   5% (8/154)   
Resolving deltas:   7% (12/154)   
Resolving deltas:  12% (20/154)   
Resolving deltas:  13% (21/154)   
Resolving deltas:  14% (22/154)   
Resolving deltas:  15% (24/154)   
Resolving deltas:  16% (25/154)   
Resolving deltas:  17% (27/154)   
Resolving deltas:  18% (28/154)   
Resolving deltas:  19% (30/154)   
Resolving deltas:  20% (31/154)   
Resolving deltas:  21% (33/154)   
Resolving deltas:  22% (34/154)   
Resolving deltas:  23% (36/154)   
Resolving deltas:  24% (37/154)   
Resolving deltas:  25% (40/154)   
Resolving deltas:  26% (41/154)   
Resolving deltas:  27% (42/154)   
Resolving deltas:  28% (44/154)   
Resolving deltas:  29% (45/154)   
Resolving deltas:  30% (47/154)   
Resolving deltas:  31% (48/154)   
Resolving deltas:  32% (50/154)   
Resolving deltas:  33% (51/154)   
Resolving deltas:  34% (53/154)   
Resolving deltas:  35% (54/154)   
Resolving deltas:  36% (56/154)   
Resolving deltas:  37% (57/154)   
Resolving deltas:  38% (59/154)   
Resolving deltas:  39% (61/154)   
Resolving deltas:  40% (62/154)   
Resolving deltas:  41% (64/154)   
Resolving deltas:  42% (65/154)   
Resolving deltas:  43% (67/154)   
Resolving deltas:  44% (68/154)   
Resolving deltas:  45% (70/154)   
Resolving deltas:  46% (71/154)   
Resolving deltas:  47% (73/154)   
Resolving deltas:  48% (74/154)   
Resolving deltas:  49% (76/154)   
Resolving deltas:  50% (77/154)   
Resolving deltas:  51% (79/154)   
Resolving deltas:  52% (81/154)   
Resolving deltas:  53% (82/154)   
Resolving deltas:  54% (84/154)   
Resolving deltas:  55% (85/154)   
Resolving deltas:  56% (87/154)   
Resolving deltas:  57% (88/154)   
Resolving deltas:  58% (90/154)   
Resolving deltas:  59% (91/154)   
Resolving deltas:  60% (93/154)   
Resolving deltas:  61% (94/154)   
Resolving deltas:  62% (96/154)   
Resolving deltas:  63% (98/154)   
Resolving deltas:  64% (99/154)   
Resolving deltas:  65% (101/154)   
Resolving deltas:  66% (102/154)   
Resolving deltas:  67% (104/154)   
Resolving deltas:  68% (105/154)   
Resolving deltas:  69% (107/154)   
Resolving deltas:  70% (108/154)   
Resolving deltas:  71% (110/154)   
Resolving deltas:  72% (111/154)   
Resolving deltas:  73% (113/154)   
Resolving deltas:  74% (114/154)   
Resolving deltas:  75% (116/154)   
Resolving deltas:  76% (118/154)   
Resolving deltas:  77% (119/154)   
Resolving deltas:  78% (121/154)   
Resolving deltas:  79% (122/154)   
Resolving deltas:  80% (124/154)   
Resolving deltas:  81% (125/154)   
Resolving deltas:  82% (127/154)   
Resolving deltas:  83% (128/154)   
Resolving deltas:  84% (130/154)   
Resolving deltas:  85% (131/154)   
Resolving deltas:  86% (133/154)   
Resolving deltas:  87% (134/154)   
Resolving deltas:  90% (140/154)   
Resolving deltas:  91% (141/154)   
Resolving deltas:  94% (146/154)   
Resolving deltas:  95% (147/154)   
Resolving deltas:  97% (150/154)   
Resolving deltas:  98% (151/154)   
Resolving deltas:  99% (153/154)   
Resolving deltas: 100% (154/154)   
Resolving deltas: 100% (154/154), completed with 123 local objects.
From git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
 * [new branch]      semaphore  -> semaphore
Already on "2.6.25-mc5"
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
s/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_tables.h                |   12 -
 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.h                  |   16 -
 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 +-
 drivers/usb/wusbcore/Kconfig                  |   17 +
 drivers/usb/wusbcore/Makefile                 |   20 +
 drivers/usb/wusbcore/cbaf.c                   |  753 ++++
 drivers/usb/wusbcore/crypto.c                 |  537 +++
 drivers/usb/wusbcore/dev-sysfs.c              |  199 +
 drivers/usb/wusbcore/devconnect.c             | 1307 +++++++
 drivers/usb/wusbcore/mmc.c                    |  329 ++
 drivers/usb/wusbcore/pal.c                    |   39 +
 drivers/usb/wusbcore/reservation.c            |  127 +
 drivers/usb/wusbcore/rh.c                     |  477 +++
 drivers/usb/wusbcore/security.c               |  536 +++
 drivers/usb/wusbcore/wa-hc.c                  |   83 +
 drivers/usb/wusbcore/wa-hc.h                  |  420 ++
 drivers/usb/wusbcore/wa-nep.c                 |  313 ++
 drivers/usb/wusbcore/wa-rpipe.c               |  548 +++
 drivers/usb/wusbcore/wa-xfer.c                | 1710 +++++++++
 drivers/usb/wusbcore/wusbhc.c                 |  395 ++
 drivers/usb/wusbcore/wusbhc.h                 |  522 +++
 drivers/uwb/Kconfig                           |   87 +
 drivers/uwb/Makefile                          |   30 +
 drivers/uwb/address.c                         |  380 ++
 drivers/uwb/beacon.c                          |  713 ++++
 drivers/uwb/driver.c                          |  308 ++
 drivers/uwb/drp-avail.c                       |  288 ++
 drivers/uwb/drp-ie.c                          |  230 ++
 drivers/uwb/drp.c                             |  406 ++
 drivers/uwb/est.c                             |  414 ++
 drivers/uwb/hwa-rc.c                          |  915 +++++
 drivers/uwb/i1480/Makefile                    |    2 +
 drivers/uwb/i1480/dfu/Makefile                |    9 +
 drivers/uwb/i1480/dfu/dfu.c                   |  281 ++
 drivers/uwb/i1480/dfu/i1480-dfu.h             |  264 ++
 drivers/uwb/i1480/dfu/mac.c                   |  530 +++
 drivers/uwb/i1480/dfu/phy.c                   |  203 +
 drivers/uwb/i1480/dfu/usb.c                   |  501 +++
 drivers/uwb/i1480/i1480-est.c                 |   99 +
 drivers/uwb/i1480/i1480-wlp.h                 |  160 +
 drivers/uwb/i1480/i1480u-wlp/Makefile         |    8 +
 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h     |  269 ++
 drivers/uwb/i1480/i1480u-wlp/lc.c             |  421 ++
 drivers/uwb/i1480/i1480u-wlp/netdev.c         |  367 ++
 drivers/uwb/i1480/i1480u-wlp/rx.c             |  492 +++
 drivers/uwb/i1480/i1480u-wlp/sysfs.c          |  446 +++
 drivers/uwb/i1480/i1480u-wlp/tx.c             |  641 +++
 drivers/uwb/ie.c                              |  591 +++
 drivers/uwb/lc-dev.c                          |  703 ++++
 drivers/uwb/lc-rc.c                           |  560 +++
 drivers/uwb/neh.c                             |  616 +++
 drivers/uwb/pal.c                             |   71 +
 drivers/uwb/reset.c                           |  328 ++
 drivers/uwb/rsv.c                             |  607 +++
 drivers/uwb/scan.c                            |  160 +
 drivers/uwb/umc-bus.c                         |  186 +
 drivers/uwb/umc-dev.c                         |  103 +
 drivers/uwb/umc-drv.c                         |   31 +
 drivers/uwb/uwb-debug.c                       |  306 ++
 drivers/uwb/uwb-internal.h                    |  298 ++
 drivers/uwb/uwbd.c                            |  428 +++
 drivers/uwb/whc-rc.c                          |  552 +++
 drivers/uwb/whci.c                            |  285 ++
 drivers/uwb/wlp/Makefile                      |   10 +
 drivers/uwb/wlp/driver.c                      |   43 +
 drivers/uwb/wlp/eda.c                         |  449 +++
 drivers/uwb/wlp/messages.c                    | 1946 ++++++++++
 drivers/uwb/wlp/sysfs.c                       |  715 ++++
 drivers/uwb/wlp/txrx.c                        |  374 ++
 drivers/uwb/wlp/wlp-internal.h                |  228 ++
 drivers/uwb/wlp/wlp-lc.c                      |  565 +++
 drivers/uwb/wlp/wss-lc.c                      | 1056 +++++
 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                      |   18 +
 include/linux/uwb/debug-cmd.h                 |   57 +
 include/linux/uwb/debug.h                     |   82 +
 include/linux/uwb/spec.h                      |  630 +++
 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 +
 276 files changed, 41272 insertions(+), 6541 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/host/hwa-hc.c
 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 drivers/usb/wusbcore/Kconfig
 create mode 100644 drivers/usb/wusbcore/Makefile
 create mode 100644 drivers/usb/wusbcore/cbaf.c
 create mode 100644 drivers/usb/wusbcore/crypto.c
 create mode 100644 drivers/usb/wusbcore/dev-sysfs.c
 create mode 100644 drivers/usb/wusbcore/devconnect.c
 create mode 100644 drivers/usb/wusbcore/mmc.c
 create mode 100644 drivers/usb/wusbcore/pal.c
 create mode 100644 drivers/usb/wusbcore/reservation.c
 create mode 100644 drivers/usb/wusbcore/rh.c
 create mode 100644 drivers/usb/wusbcore/security.c
 create mode 100644 drivers/usb/wusbcore/wa-hc.c
 create mode 100644 drivers/usb/wusbcore/wa-hc.h
 create mode 100644 drivers/usb/wusbcore/wa-nep.c
 create mode 100644 drivers/usb/wusbcore/wa-rpipe.c
 create mode 100644 drivers/usb/wusbcore/wa-xfer.c
 create mode 100644 drivers/usb/wusbcore/wusbhc.c
 create mode 100644 drivers/usb/wusbcore/wusbhc.h
 create mode 100644 drivers/uwb/Kconfig
 create mode 100644 drivers/uwb/Makefile
 create mode 100644 drivers/uwb/address.c
 create mode 100644 drivers/uwb/beacon.c
 create mode 100644 drivers/uwb/driver.c
 create mode 100644 drivers/uwb/drp-avail.c
 create mode 100644 drivers/uwb/drp-ie.c
 create mode 100644 drivers/uwb/drp.c
 create mode 100644 drivers/uwb/est.c
 create mode 100644 drivers/uwb/hwa-rc.c
 create mode 100644 drivers/uwb/i1480/Makefile
 create mode 100644 drivers/uwb/i1480/dfu/Makefile
 create mode 100644 drivers/uwb/i1480/dfu/dfu.c
 create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h
 create mode 100644 drivers/uwb/i1480/dfu/mac.c
 create mode 100644 drivers/uwb/i1480/dfu/phy.c
 create mode 100644 drivers/uwb/i1480/dfu/usb.c
 create mode 100644 drivers/uwb/i1480/i1480-est.c
 create mode 100644 drivers/uwb/i1480/i1480-wlp.h
 create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile
 create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h
 create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c
 create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c
 create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c
 create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c
 create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c
 create mode 100644 drivers/uwb/ie.c
 create mode 100644 drivers/uwb/lc-dev.c
 create mode 100644 drivers/uwb/lc-rc.c
 create mode 100644 drivers/uwb/neh.c
 create mode 100644 drivers/uwb/pal.c
 create mode 100644 drivers/uwb/reset.c
 create mode 100644 drivers/uwb/rsv.c
 create mode 100644 drivers/uwb/scan.c
 create mode 100644 drivers/uwb/umc-bus.c
 create mode 100644 drivers/uwb/umc-dev.c
 create mode 100644 drivers/uwb/umc-drv.c
 create mode 100644 drivers/uwb/uwb-debug.c
 create mode 100644 drivers/uwb/uwb-internal.h
 create mode 100644 drivers/uwb/uwbd.c
 create mode 100644 drivers/uwb/whc-rc.c
 create mode 100644 drivers/uwb/whci.c
 create mode 100644 drivers/uwb/wlp/Makefile
 create mode 100644 drivers/uwb/wlp/driver.c
 create mode 100644 drivers/uwb/wlp/eda.c
 create mode 100644 drivers/uwb/wlp/messages.c
 create mode 100644 drivers/uwb/wlp/sysfs.c
 create mode 100644 drivers/uwb/wlp/txrx.c
 create mode 100644 drivers/uwb/wlp/wlp-internal.h
 create mode 100644 drivers/uwb/wlp/wlp-lc.c
 create mode 100644 drivers/uwb/wlp/wss-lc.c
 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

sent 8038352 bytes  received 290 bytes  16077284.00 bytes/sec
total size is 8036078  speedup is 1.00
Using base gregkh-usb
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/README         |    9 ++++-
 fs/cifs/cifs_dfs_ref.c |    2 +-
 fs/cifs/cifsacl.c      |   14 ++++---
 fs/cifs/cifsacl.h      |    1 +
 fs/cifs/cifsfs.h       |    2 -
 fs/cifs/cifspdu.h      |  110 ++++++++++++++++++++++++++++++++++++++++++------
 fs/cifs/cifsproto.h    |    1 +
 fs/cifs/cifssmb.c      |   32 ++++++++------
 fs/cifs/connect.c      |    1 +
 fs/cifs/transport.c    |   18 ++++++++
 11 files changed, 155 insertions(+), 38 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
Auto-merged drivers/net/ucc_geth.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       |  622 +++++++++++++-
 Documentation/powerpc/phyp-assisted-dump.txt       |  127 +++
 arch/powerpc/Kconfig                               |   82 ++-
 arch/powerpc/Kconfig.debug                         |    2 +-
 arch/powerpc/Makefile                              |   12 +-
 arch/powerpc/boot/Makefile                         |   40 +-
 arch/powerpc/boot/bamboo.c                         |    3 +-
 arch/powerpc/boot/cpm-serial.c                     |  117 ++-
 arch/powerpc/boot/cuboot-pq2.c                     |   27 +-
 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/devtree.c                        |   20 +
 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/ep8248e.dts                  |    5 +-
 arch/powerpc/boot/dts/ep88xc.dts                   |   73 +-
 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/kuroboxHD.dts                |   83 +-
 arch/powerpc/boot/dts/kuroboxHG.dts                |   83 +-
 arch/powerpc/boot/dts/makalu.dts                   |    4 +-
 arch/powerpc/boot/dts/mpc7448hpc2.dts              |   97 +-
 arch/powerpc/boot/dts/mpc8272ads.dts               |  132 ++--
 arch/powerpc/boot/dts/mpc832x_mds.dts              |    7 +-
 arch/powerpc/boot/dts/mpc832x_rdb.dts              |    4 -
 arch/powerpc/boot/dts/mpc836x_mds.dts              |    4 -
 arch/powerpc/boot/dts/mpc8540ads.dts               |  173 ++--
 arch/powerpc/boot/dts/mpc8541cds.dts               |  161 ++--
 arch/powerpc/boot/dts/mpc8544ds.dts                |  299 ++++---
 arch/powerpc/boot/dts/mpc8548cds.dts               |  289 +++---
 arch/powerpc/boot/dts/mpc8555cds.dts               |  161 ++--
 arch/powerpc/boot/dts/mpc8560ads.dts               |  209 +++---
 arch/powerpc/boot/dts/mpc8568mds.dts               |  291 +++----
 arch/powerpc/boot/dts/mpc8572ds.dts                |  383 ++++----
 arch/powerpc/boot/dts/mpc8641_hpcn.dts             |    2 +-
 arch/powerpc/boot/dts/mpc866ads.dts                |   58 +-
 arch/powerpc/boot/dts/mpc885ads.dts                |   77 +-
 arch/powerpc/boot/dts/pq2fads.dts                  |  126 ++--
 arch/powerpc/boot/dts/prpmc2800.dts                |  336 ++++----
 arch/powerpc/boot/dts/rainier.dts                  |    6 +-
 arch/powerpc/boot/dts/sbc8641d.dts                 |  352 ++++++++
 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/mpc52xx-psc.c                    |    9 +-
 arch/powerpc/boot/mpsc.c                           |    2 +-
 arch/powerpc/boot/mv64x60.c                        |    4 +-
 arch/powerpc/boot/mv64x60_i2c.c                    |    2 +-
 arch/powerpc/boot/ns16550.c                        |   10 +-
 arch/powerpc/boot/ops.h                            |    1 +
 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 
 .../configs/{ => 83xx}/mpc8313_rdb_defconfig       |    8 +-
 .../configs/{ => 83xx}/mpc8315_rdb_defconfig       |    0 
 .../configs/{ => 83xx}/mpc832x_mds_defconfig       |    0 
 .../configs/{ => 83xx}/mpc832x_rdb_defconfig       |    0 
 .../configs/{ => 83xx}/mpc834x_itx_defconfig       |    0 
 .../configs/{ => 83xx}/mpc834x_itxgp_defconfig     |    0 
 .../configs/{ => 83xx}/mpc834x_mds_defconfig       |    0 
 .../configs/{ => 83xx}/mpc836x_mds_defconfig       |    0 
 .../configs/{ => 83xx}/mpc837x_mds_defconfig       |    0 
 .../configs/{ => 83xx}/mpc837x_rdb_defconfig       |    0 
 arch/powerpc/configs/{ => 83xx}/sbc834x_defconfig  |    0 
 .../ksi8560_defconfig}                             |  250 +++---
 .../configs/{ => 85xx}/mpc8540_ads_defconfig       |    0 
 .../configs/{ => 85xx}/mpc8544_ds_defconfig        |   17 +-
 .../configs/{ => 85xx}/mpc8560_ads_defconfig       |    0 
 .../configs/{ => 85xx}/mpc8568mds_defconfig        |    0 
 .../configs/{ => 85xx}/mpc8572_ds_defconfig        |    0 
 .../configs/{ => 85xx}/mpc85xx_cds_defconfig       |    0 
 arch/powerpc/configs/{ => 85xx}/sbc8548_defconfig  |    0 
 arch/powerpc/configs/{ => 85xx}/sbc8560_defconfig  |    0 
 arch/powerpc/configs/{ => 85xx}/stx_gp3_defconfig  |    0 
 arch/powerpc/configs/{ => 85xx}/tqm8540_defconfig  |    0 
 arch/powerpc/configs/{ => 85xx}/tqm8541_defconfig  |    0 
 arch/powerpc/configs/{ => 85xx}/tqm8555_defconfig  |    0 
 arch/powerpc/configs/{ => 85xx}/tqm8560_defconfig  |    0 
 arch/powerpc/configs/chrp32_defconfig              |    7 +-
 arch/powerpc/configs/g5_defconfig                  |    7 +-
 arch/powerpc/configs/iseries_defconfig             |    7 +-
 arch/powerpc/configs/maple_defconfig               |  131 +++-
 arch/powerpc/configs/mpc83xx_defconfig             |  164 ++++-
 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 +-
 .../{stx_gp3_defconfig => sbc8641d_defconfig}      |  937 +++++++++++---------
 arch/powerpc/kernel/Makefile                       |    1 +
 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/entry_32.S                     |   30 +-
 arch/powerpc/kernel/entry_64.S                     |   30 +-
 arch/powerpc/kernel/head_32.S                      |   22 +-
 arch/powerpc/kernel/head_44x.S                     |    4 +-
 arch/powerpc/kernel/head_64.S                      |   69 +-
 arch/powerpc/kernel/head_booke.h                   |   33 +-
 arch/powerpc/kernel/head_fsl_booke.S               |   44 +-
 arch/powerpc/kernel/ibmebus.c                      |   12 +-
 arch/powerpc/kernel/iommu.c                        |    4 +-
 arch/powerpc/kernel/irq.c                          |   18 +-
 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                    |    7 +-
 arch/powerpc/kernel/process.c                      |   33 +-
 arch/powerpc/kernel/prom.c                         |  120 +++-
 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                     |    8 +-
 arch/powerpc/kernel/stacktrace.c                   |   47 +
 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/rheap.c                           |    4 +-
 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                          |    7 +-
 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