Switched to branch "2.6.25-rc5-mc5"
Switched to branch "ide"
Context reduced to (1/1) to apply fragment at 980
Context reduced to (2/2) to apply fragment at 444
Switched to branch "2.6.25-rc5-mc5"
Already on branch "2.6.25-rc5-mc5"
Switched to branch "gregkh-driver"
.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.
Switched to branch "2.6.25-rc5-mc5"
Already on branch "2.6.25-rc5-mc5"
Automatic merge failed; fix conflicts and then commit the result.
Switched to branch "gregkh-pci"
.dotest/patch:167: space before tab in indent.
 	dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
warning: 1 line adds whitespace errors.
Switched to branch "2.6.25-rc5-mc5"
Already on branch "2.6.25-rc5-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:2601: space before tab in indent.
 		dbg(1," %s : file is NULL", __func__);
.dotest/patch:2609: space before tab in indent.
 		dbg(1," %s : object is NULL", __func__);
.dotest/patch:8366: space before tab in indent.
  	dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length);
.dotest/patch:8741: space before tab in indent.
		  	dbg ("%s - Update complete 0x%x", __func__, status);
.dotest/patch:8805: space before tab in indent.
	  		dbg ("%s - Error downloading operational code image", __func__);
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
Switched to branch "2.6.25-rc5-mc5"
Already on branch "2.6.25-rc5-mc5"
remote: Counting objects: 119, done.
remote: Compressing objects:   2% (1/38)   
remote: Compressing objects:   5% (2/38)   
remote: Compressing objects:   7% (remote: 3/38)   
remote: Compressing objects:  10% (4/38)   
remote: Compressing objects:  13% (5/38)   
remote: Compressing objects:  15% (6/38)   
remote: Compressing objects:  18% (7/38)   
remote: Compressing objects:  21% (8/38)   
remote: Compressing objects:  23% (9/38)   
remote: Compressing objects:  26% (10/38)   
remote: Compressing objects:  28% (11/38)   
remote: Compressing objects:  31% (12/38)   
remote: Compressing objects:  34% (13/38)   
remote: Compressing objects:  36% (14/38)   
remote: Compressing objects:  39% (15/38)   
remote: Compressing objects:  42% (16/38)   
remote: Compressing objects:  44% (17/38)   
remote: Compressing objecremote: ts:  47% (18/38)   
remote: Compressing objects:  50% (19/38)   
remote: Compressing objects:  52% (20/38)   
remote: Compressing objects:  55% (21/38) remote:   
remote: Compressing objects:  57% (22/38)   
remote: Compressing objects:  60% (23/38)   
remote: Compressing objects:  63% (24/38)   
remote: Compressing obremote: jects:  65% (25/38)   
remote: Compressing objects:  68% (26/38)   
remote: Compressing objects:  71% (27/38)   
remote: Compressing objects:  73% (28/3remote: 8)   
remote: Compressing objects:  76% (29/38)   
remote: Compressing objects:  78% (30/38)   
remote: Compressing objects:  81% (31/38)   
remote: Compressingremote:  objects:  84% (32/38)   
remote: Compressing objects:  86% (33/38)   
remote: Compressing objects:  89% (34/38)   
remote: Compressing objects:  92% (3remote: 5/38)   
remote: Compressing objects:  94% (36/38)   
remote: Compressing objects:  97% (37/38)   
remote: Compressing objects: 100% (38/38)   
remote: Compressremote: ing objects: 100% (38/38), done.
remote: Total 90 (delta 74), reused 68 (delta 52)
From /pub/scm/linux/kernel/git/perex/alsa
 * [new branch]      linus      -> alsa
remote: Counting objects: 22   
remote: Counting objects: 207, done.
remote: Compressing objects:   1% (1/57)   
remote: Compressing objects:   3% (2/57)   
remote: Compressing objects:   5% (3/57)   
remote: Compressing objects:remote:    7% (4/57)   
remote: Compressing objects:   8% (5/57)   
remote: Compressing objects:  10% (6/57)   
remote: Compressing objects:  12% (7/57)   
remote: Compremote: ressing objects:  14% (8/57)   
remote: Compressing objects:  15% (9/57)   
remote: Compressing objects:  17% (10/57)   
remote: Compressing objects:  1remote: 9% (11/57)   
remote: Compressing objects:  21% (12/57)   
remote: Compressing objects:  22% (13/57)   
remote: Compressing objects:  24% (14/57)   
remote: Compressing objects:  26% (15/57)   
remote: Compressing objects:  28% (16/57)   
remote: Compressing objecremote: ts:  29% (17/57)   
remote: Compressing objects:  31% (18/57)   
remote: Compressing objects:  33% (19/57)   
remote: Compressing objects:  35% (20/57) remote:   
remote: Compressing objects:  36% (21/57)   
remote: Compressing objects:  38% (22/57)   
remote: Compressing objects:  40% (23/57)   
remote: Compressing obremote: jects:  42% (24/57)   
remote: Compressing objects:  43% (25/57)   
remote: Compressing objects:  45% (26/57)   
remote: Compressing objects:  47% (27/5remote: 7)   
remote: Compressing objects:  49% (28/57)   
remote: Compressing objects:  50% (29/57)   
remote: Compressing objects:  52% (30/57)   
remote: Compressingremote:  objects:  54% (31/57)   
remote: Compressing objects:  56% (32/57)   
remote: Compressing objects:  57% (33/57)   
remote: Compressing objects:  59% (3remote: 4/57)   
remote: Compressing objects:  61% (35/57)   
remote: Compressing objects:  63% (36/57)   
remote: Compressing objects:  64% (37/57)   
remote: Compressremote: ing objects:  66% (38/57)   
remote: Compressing objects:  68% (39/57)   
remote: Compressing objects:  70% (40/57)   
remote: Compressing objects:  71%remote:  (41/57)   
remote: Compressing objects:  73% (42/57)   
remote: Compressing objects:  75% (43/57)   
remote: Compressing objects:  77% (44/57)   
remote: Comprremote: essing objects:  78% (45/57)   
remote: Compressing objects:  80% (46/57)   
remote: Compressing objects:  82% (47/57)   
remote: Compressing objects:  remote: 84% (48/57)   
remote: Compressing objects:  85% (49/57)   
remote: Compressing objects:  87% (50/57)   
remote: Compressing objects:  89% (51/57)   
remote: Coremote: mpressing objects:  91% (52/57)   
remote: Compressing objects:  92% (53/57)   
remote: Compressing objects:  94% (54/57)   
remote: Compressing objectsremote: :  96% (55/57)   
remote: Compressing objects:  98% (56/57)   
remote: Compressing objects: 100% (57/57)   
remote: Compressing objects: 100% (57/57), dremote: one.
Receiving objects:   0% (1/153)   
Receiving objects:   1% (2/153)   
Receiving objects:   2% (4/153)   
Receiving objects:   3% (5/153)   
Receiving objects:   4% (7/153)   
Receiving objects:   5% (8/153)   
Receiving objects:   6% (10/153)   
remote: Total 153 (delta 124), reused 121 (delta 96)
Receiving objects:   7% (11/153)   
Receiving objects:   8% (13/153)   
Receiving objects:   9% (14/153)   
Receiving objects:  10% (16/153)   
Receiving objects:  11% (17/153)   
Receiving objects:  12% (19/153)   
Receiving objects:  13% (20/153)   
Receiving objects:  14% (22/153)   
Receiving objects:  15% (23/153)   
Receiving objects:  16% (25/153)   
Receiving objects:  17% (27/153)   
Receiving objects:  18% (28/153)   
Receiving objects:  19% (30/153)   
Receiving objects:  20% (31/153)   
Receiving objects:  21% (33/153)   
Receiving objects:  22% (34/153)   
Receiving objects:  23% (36/153)   
Receiving objects:  24% (37/153)   
Receiving objects:  25% (39/153)   
Receiving objects:  26% (40/153)   
Receiving objects:  27% (42/153)   
Receiving objects:  28% (43/153)   
Receiving objects:  29% (45/153)   
Receiving objects:  30% (46/153)   
Receiving objects:  31% (48/153)   
Receiving objects:  32% (49/153)   
Receiving objects:  33% (51/153)   
Receiving objects:  34% (53/153)   
Receiving objects:  35% (54/153)   
Receiving objects:  36% (56/153)   
Receiving objects:  37% (57/153)   
Receiving objects:  38% (59/153)   
Receiving objects:  39% (60/153)   
Receiving objects:  40% (62/153)   
Receiving objects:  41% (63/153)   
Receiving objects:  42% (65/153)   
Receiving objects:  43% (66/153)   
Receiving objects:  44% (68/153)   
Receiving objects:  45% (69/153)   
Receiving objects:  46% (71/153)   
Receiving objects:  47% (72/153)   
Receiving objects:  48% (74/153)   
Receiving objects:  49% (75/153)   
Receiving objects:  50% (77/153)   
Receiving objects:  51% (79/153)   
Receiving objects:  52% (80/153)   
Receiving objects:  53% (82/153)   
Receiving objects:  54% (83/153)   
Receiving objects:  55% (85/153)   
Receiving objects:  56% (86/153)   
Receiving objects:  57% (88/153)   
Receiving objects:  58% (89/153)   
Receiving objects:  59% (91/153)   
Receiving objects:  60% (92/153)   
Receiving objects:  61% (94/153)   
Receiving objects:  62% (95/153)   
Receiving objects:  63% (97/153)   
Receiving objects:  64% (98/153)   
Receiving objects:  65% (100/153)   
Receiving objects:  66% (101/153)   
Receiving objects:  67% (103/153)   
Receiving objects:  68% (105/153)   
Receiving objects:  69% (106/153)   
Receiving objects:  70% (108/153)   
Receiving objects:  71% (109/153)   
Receiving objects:  72% (111/153)   
Receiving objects:  73% (112/153)   
Receiving objects:  74% (114/153)   
Receiving objects:  75% (115/153)   
Receiving objects:  76% (117/153)   
Receiving objects:  77% (118/153)   
Receiving objects:  78% (120/153)   
Receiving objects:  79% (121/153)   
Receiving objects:  80% (123/153)   
Receiving objects:  81% (124/153)   
Receiving objects:  82% (126/153)   
Receiving objects:  83% (127/153)   
Receiving objects:  84% (129/153)   
Receiving objects:  85% (131/153)   
Receiving objects:  86% (132/153)   
Receiving objects:  87% (134/153)   
Receiving objects:  88% (135/153)   
Receiving objects:  89% (137/153)   
Receiving objects:  90% (138/153)   
Receiving objects:  91% (140/153)   
Receiving objects:  92% (141/153)   
Receiving objects:  93% (143/153)   
Receiving objects:  94% (144/153)   
Receiving objects:  95% (146/153)   
Receiving objects:  96% (147/153)   
Receiving objects:  97% (149/153)   
Receiving objects:  98% (150/153)   
Receiving objects:  99% (152/153)   
Receiving objects: 100% (153/153)   
Receiving objects: 100% (153/153), 30.65 KiB, done.
Resolving deltas:  13% (17/124)   
Resolving deltas:  20% (25/124)   
Resolving deltas:  26% (33/124)   
Resolving deltas:  27% (34/124)   
Resolving deltas:  30% (38/124)   
Resolving deltas:  31% (39/124)   
Resolving deltas:  32% (40/124)   
Resolving deltas:  33% (41/124)   
Resolving deltas:  37% (47/124)   
Resolving deltas:  39% (49/124)   
Resolving deltas:  42% (53/124)   
Resolving deltas:  43% (54/124)   
Resolving deltas:  44% (55/124)   
Resolving deltas:  49% (61/124)   
Resolving deltas:  50% (62/124)   
Resolving deltas:  51% (64/124)   
Resolving deltas:  54% (67/124)   
Resolving deltas:  55% (69/124)   
Resolving deltas:  56% (70/124)   
Resolving deltas:  59% (74/124)   
Resolving deltas:  62% (78/124)   
Resolving deltas:  66% (82/124)   
Resolving deltas:  74% (92/124)   
Resolving deltas:  81% (101/124)   
Resolving deltas:  84% (105/124)   
Resolving deltas:  86% (107/124)   
Resolving deltas:  87% (108/124)   
Resolving deltas:  88% (110/124)   
Resolving deltas:  89% (111/124)   
Resolving deltas:  90% (112/124)   
Resolving deltas:  91% (114/124)   
Resolving deltas:  92% (115/124)   
Resolving deltas:  93% (116/124)   
Resolving deltas:  94% (117/124)   
Resolving deltas:  95% (118/124)   
Resolving deltas:  96% (120/124)   
Resolving deltas:  98% (122/124)   
Resolving deltas:  99% (123/124)   
Resolving deltas: 100% (124/124)   
Resolving deltas: 100% (124/124), completed with 41 local objects.
From /pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
 + 9a1e3d7...e3845a6 avr32-arch -> avr32  (forced update)
Already on branch "2.6.25-rc5-mc5"
remote: Counting objects: 1660, done.
remote: Compressing objects:   0% (1/390)   
remote: Compressing objects:   1% (4/390)   
remote: Compressing objects:   2% (8/390)   
remote: Compressing objects:   3% (12/390)   
remote: Compressing objects:   4% (16/390)   
remote: Compressing objects:   5% (20/390)   
remote: Compressing objects:   6% (24/390)   
remote: Compressing objects:   7% (28/390)   
remote: Compressing objects:   8% (32/390)   
remote: Compressing objects:   9% (36/390)   
remote: Compressing objects:  10% (39/390)   
remote: Compressing objects:  11% (43/390)   
remote: Compressing objects:  12% (47/390)   
remote: Compressing objects:  13% (51/390)   
remote: Compressing objects:  14% (55/390)   
remote: Compressing objects:  15% (59/390)   
remote: Compressing objects:  16% (63/390)   
remote: Compressing objects:  17% (67/390)   
remote: Compressing objects:  18% (71/390)   
remote: Compressing objects:  19% (75/390)   
remote: Compressing objects:  20% (78/390)   
remote: Compressing objects:  21% (82/390)   
remote: Compressing objects:  22% (86/390)   
remote: Compressing objects:  23% (90/390)   
remote: Compressing objects:  24% (94/390)   
remote: Compressing objects:  25% (98/390)   
remote: Compressing objects:  26% (102/390)   
remote: Compressing objects:  27% (106/390)   
remote: Compressing objects:  28% (110/390)   
remote: Compressing objects:  29% (114/390)   
remote: Compressing objects:  30% (117/390)   
remote: Compressing objects:  31% (121/390)   
remote: Compressing objects:  32% (125/390)   
remote: Compressing objects:  33% (129/390)   
remote: Compressing objects:  34% (133/390)   
remote: Compressing objects:  35% (137/390)   
remote: Compressing objects:  36% (141/390)   
remote: Compressing objects:  37% (145/390)   
remote: Compressing objects:  38% (149/390)   
remote: Compressing objects:  39% (153/390)   
remote: Compressing objects:  40% (156/390)   
remote: Compressing objects:  41% (160/390)   
remote: Compressing objects:  42% (164/390)   
remote: Compressing objects:  43% (168/390)   
remote: Compressing objects:  44% (172/390)   
remote: Compressing objects:  45% (176/390)   
remote: Compressing objects:  46% (180/390)   
remote: Compressing objects:  47% (184/390)   
remote: Compressing objects:  48% (188/390)   
remote: Compressing objects:  49% (192/390)   
remote: Compressing objects:  50% (195/390)   
remote: Compressing objects:  51% (199/390)   
remote: Compressing objects:  52% (203/390)   
remote: Compressing objects:  53% (207/390)   
remote: Compressing objects:  54% (211/390)   
remote: Compressing objects:  55% (215/390)   
remote: Compressing objects:  56% (219/390)   
remote: Compressing objects:  57% (223/390)   
remote: Compressing objects:  58% (227/390)   
remote: Compressing objects:  59% (231/390)   
remote: Compressing objects:  60% (234/390)   
remote: Compressing objects:  61% (238/390)   
remote: Compressing objects:  62% (242/390)   
remote: Compressing objects:  63% (246/390)   
remote: Compressing objects:  64% (250/390)   
remote: Compressing objects:  65% (254/390)   
remote: Compressing objects:  66% (258/390)   
remote: Compressing objects:  67% (262/390)   
remote: Compressing objects:  68% (266/390)   
remote: Compressing objects:  69% (270/390)   
remote: Compressing objects:  70% (273/390)   
remote: Compressing objects:  71% (277/390)   
remote: Compressing objects:  72% (281/390)   
remote: Compressing objects:  73% (285/390)   
remote: Compressing objects:  74% (289/390)   
remote: Compressing objects:  75% (293/390)   
remote: Compressing objects:  76% (297/390)   
remote: Compressing objects:  77% (301/390)   
remote: Compressing objects:  78% (305/390)   
remote: Compressing objects:  79% (309/390)   
remote: Compressing objects:  80% (312/390)   
remote: Compressing objects:  81% (316/390)   
remote: Compressing objects:  82% (320/390)   
remote: Compressing objects:  83% (324/390)   
remote: Compressing objects:  84% (328/390)   
remote: Compressing objects:  85% (332/390)   
remote: Compressing objects:  86% (336/390)   
remote: Compressing objects:  87% (340/390)   
remote: Compressing objects:  88% (344/390)   
remote: Compressing objects:  89% (348/390)   
remote: Compressing objects:  90% (351/390)   
remote: Compressing objects:  91% (355/390)   
remote: Compressing objects:  92% (359/390)   
remote: Compressing objects:  93% (363/390)   
remote: Compressing objects:  94% (367/390)   
remote: Compressing objects:  95% (371/390)   
remote: Compressing objects:  96% (375/390)   
remote: Compressing objects:  97% (379/390)   
remote: Compressing objects:  98% (383/390)   
remote: Compressing objects:  99% (387/390)   
remote: Compressing objects: 100% (390/390)   
remote: Compressing objects: 100% (390/390), done.
Receiving objects:   0% (1/1427)   
Receiving objects:   1% (15/1427)   
Receiving objects:   2% (29/1427)   
Receiving objects:   3% (43/1427)   
Receiving objects:   4% (58/1427)   
Receiving objects:   5% (72/1427)   
Receiving objects:   6% (86/1427)   
Receiving objects:   7% (100/1427)   
Receiving objects:   8% (115/1427)   
Receiving objects:   9% (129/1427)   
Receiving objects:  10% (143/1427)   
Receiving objects:  11% (157/1427)   
Receiving objects:  12% (172/1427)   
Receiving objects:  13% (186/1427)   
Receiving objects:  14% (200/1427)   
Receiving objects:  15% (215/1427)   
Receiving objects:  16% (229/1427)   
Receiving objects:  17% (243/1427)   
Receiving objects:  18% (257/1427)   
Receiving objects:  19% (272/1427)   
Receiving objects:  20% (286/1427)   
Receiving objects:  21% (300/1427)   
Receiving objects:  22% (314/1427)   
Receiving objects:  23% (329/1427)   
Receiving objects:  24% (343/1427)   
Receiving objects:  25% (357/1427)   
Receiving objects:  26% (372/1427)   
Receiving objects:  27% (386/1427)   
Receiving objects:  28% (400/1427)   
Receiving objects:  29% (414/1427)   
Receiving objects:  30% (429/1427)   
Receiving objects:  31% (443/1427)   
Receiving objects:  32% (457/1427)   
Receiving objects:  33% (471/1427)   
Receiving objects:  34% (486/1427)   
Receiving objects:  35% (500/1427)   
Receiving objects:  36% (514/1427)   
Receiving objects:  37% (528/1427)   
Receiving objects:  38% (543/1427)   
Receiving objects:  39% (557/1427)   
Receiving objects:  40% (571/1427)   
Receiving objects:  41% (586/1427)   
Receiving objects:  42% (600/1427)   
Receiving objects:  43% (614/1427)   
Receiving objects:  44% (628/1427)   
Receiving objects:  45% (643/1427)   
Receiving objects:  46% (657/1427)   
Receiving objects:  47% (671/1427)   
Receiving objects:  48% (685/1427)   
Receiving objects:  49% (700/1427)   
Receiving objects:  50% (714/1427)   
Receiving objects:  51% (728/1427)   
Receiving objects:  52% (743/1427)   
Receiving objects:  53% (757/1427)   
Receiving objects:  54% (771/1427)   
Receiving objects:  55% (785/1427)   
Receiving objects:  56% (800/1427)   
Receiving objects:  57% (814/1427)   
Receiving objects:  58% (828/1427)   
Receiving objects:  59% (842/1427)   
Receiving objects:  60% (857/1427)   
Receiving objects:  61% (871/1427)   
Receiving objects:  62% (885/1427)   
Receiving objects:  63% (900/1427)   
Receiving objects:  64% (914/1427)   
Receiving objects:  65% (928/1427)   
Receiving objects:  66% (942/1427)   
Receiving objects:  67% (957/1427)   
Receiving objects:  68% (971/1427)   
Receiving objects:  69% (985/1427)   
Receiving objects:  70% (999/1427)   
Receiving objects:  71% (1014/1427)   
Receiving objects:  72% (1028/1427)   
Receiving objects:  73% (1042/1427)   
Receiving objects:  74% (1056/1427)   
Receiving objects:  75% (1071/1427)   
Receiving objects:  76% (1085/1427)   
Receiving objects:  77% (1099/1427)   
Receiving objects:  78% (1114/1427)   
Receiving objects:  79% (1128/1427)   
Receiving objects:  80% (1142/1427)   
Receiving objects:  81% (1156/1427)   
Receiving objects:  82% (1171/1427)   
Receiving objects:  83% (1185/1427)   
Receiving objects:  84% (1199/1427)   
Receiving objects:  85% (1213/1427)   
Receiving objects:  86% (1228/1427)   
Receiving objects:  87% (1242/1427)   
Receiving objects:  88% (1256/1427)   
Receiving objects:  89% (1271/1427)   
Receiving objects:  90% (1285/1427)   
Receiving objects:  91% (1299/1427)   
Receiving objects:  92% (1313/1427)   
Receiving objects:  93% (1328/1427)   
Receiving objects:  94% (1342/1427)   
Receiving objects:  95% (1356/1427)   
Receiving objects:  96% (1370/1427)   
Receiving objects:  97% (1385/1427)   
Receiving objects:  98% (1399/1427)   
Receiving objects:  99% (1413/1427)   
Receiving objects: 100% (1427/1427)   
Receiving objects: 100% (1427/1427), 243.27 KiB, done.
Resolving deltas:   0% (8/1253)   
Resolving deltas:  10% (128/1253)   
Resolving deltas:  11% (142/1253)   
Resolving deltas:  13% (164/1253)   
Resolving deltas:  14% (184/1253)   
Resolving deltas:  15% (188/1253)   
Resolving deltas:  18% (228/1253)   
Resolving deltas:  31% (395/1253)   
Resolving deltas:  32% (407/1253)   
Resolving deltas:  33% (419/1253)   
Resolving deltas:  34% (427/1253)   
Resolving deltas:  35% (439/1253)   
Resolving deltas:  47% (601/1253)   
Resolving deltas:  48% (604/1253)   
remote: Total 1427 (delta 1253), reused 1197 (delta 1037)
Resolving deltas:  49% (614/1253)   
Resolving deltas:  50% (627/1253)   
Resolving deltas:  51% (640/1253)   
Resolving deltas:  52% (656/1253)   
Resolving deltas:  53% (665/1253)   
Resolving deltas:  65% (821/1253)   
Resolving deltas:  66% (828/1253)   
Resolving deltas:  67% (840/1253)   
Resolving deltas:  68% (856/1253)   
Resolving deltas:  69% (865/1253)   
Resolving deltas:  70% (879/1253)   
Resolving deltas:  71% (890/1253)   
Resolving deltas:  72% (909/1253)   
Resolving deltas:  73% (915/1253)   
Resolving deltas:  74% (931/1253)   
Resolving deltas:  75% (940/1253)   
Resolving deltas:  76% (955/1253)   
Resolving deltas:  77% (965/1253)   
Resolving deltas:  78% (978/1253)   
Resolving deltas:  80% (1010/1253)   
Resolving deltas:  81% (1015/1253)   
Resolving deltas:  82% (1028/1253)   
Resolving deltas:  83% (1052/1253)   
Resolving deltas:  84% (1060/1253)   
Resolving deltas:  85% (1067/1253)   
Resolving deltas:  86% (1081/1253)   
Resolving deltas:  87% (1093/1253)   
Resolving deltas:  88% (1107/1253)   
Resolving deltas:  89% (1116/1253)   
Resolving deltas:  90% (1129/1253)   
Resolving deltas:  91% (1144/1253)   
Resolving deltas:  92% (1157/1253)   
Resolving deltas:  93% (1167/1253)   
Resolving deltas:  94% (1178/1253)   
Resolving deltas:  95% (1191/1253)   
Resolving deltas:  96% (1203/1253)   
Resolving deltas:  97% (1219/1253)   
Resolving deltas:  98% (1230/1253)   
Resolving deltas:  99% (1244/1253)   
Resolving deltas: 100% (1253/1253)   
Resolving deltas: 100% (1253/1253), completed with 217 local objects.
From /pub/scm/linux/kernel/git/mchehab/v4l-dvb
 + 6946978...72c2a88 devel      -> dvb  (forced update)
Switched to branch "i2c"
Switched to branch "2.6.25-rc5-mc5"
Already on branch "2.6.25-rc5-mc5"
remote: Counting objects: 1   
remote: Counting objects: 23, done.
remote: Compressing objects:   7% (1/13)   
remote: Compressing objects:  15% (2/13)   
remote: Compressing objects:  23% (3/13)   
remote: Compressing objects:remote:   30% (4/13)   
remote: Compressing objects:  38% (5/13)   
remote: Compressing objects:  46% (6/13)   
remote: Compressing objects:  53% (7/13)   
remote: Compremote: ressing objects:  61% (8/13)   
remote: Compressing objects:  69% (9/13)   
remote: Compressing objects:  76% (10/13)   
remote: Compressing objects:  8remote: 4% (11/13)   
remote: Compressing objects:  92% (12/13)   
remote: Compressing objects: 100% (13/13)   
remote: Compressing objects: 100% (13/13), done.remote: 
remote: Total 13 (delta 11), reused 0 (delta 0)
From /pub/scm/linux/kernel/git/dtor/input
   1376092..08342bf  for-linus  -> input
From /pub/scm/linux/kernel/git/dtor/input
   baadac8..08342bf  master     -> input-devel
From /pub/scm/linux/kernel/git/roland/infiniband
   baadac8..dba92d3  for-linus  -> infiniband-for-linus
remote: Counting objects: 242, done.
remote: Compressing objects:   3% (1/30)   
remote: Compressing objects:   6% (2/30)   
remote: Compressing objects:  10% (remote: 3/30)   
remote: Compressing objects:  13% (4/30)   
remote: Compressing objects:  16% (5/30)   
remote: Compressing objects:  20% (6/30)   
remote: Compressingremote:  objects:  23% (7/30)   
remote: Compressing objects:  26% (8/30)   
remote: Compressing objects:  30% (9/30)   
remote: Compressing objects:  33% (10/3remote: 0)   
remote: Compressing objects:  36% (11/30)   
remote: Compressing objects:  40% (12/30)   
remote: Compressing objects:  43% (13/30)   
remote: Compressingremote:  objects:  46% (14/30)   
remote: Compressing objects:  50% (15/30)   
remote: Compressing objects:  53% (16/30)   
remote: Compressing objects:  56% (1remote: 7/30)   
remote: Compressing objects:  60% (18/30)   
remote: Compressing objects:  63% (19/30)   
remote: Compressing objects:  66% (20/30)   
remote: Compressremote: ing objects:  70% (21/30)   
remote: Compressing objects:  73% (22/30)   
remote: Compressing objects:  76% (23/30)   
remote: Compressing objects:  80%remote:  (24/30)   
remote: Compressing objects:  83% (25/30)   
remote: Compressing objects:  86% (26/30)   
remote: Compressing objects:  90% (27/30)   
remote: Comprremote: essing objects:  93% (28/30)   
remote: Compressing objects:  96% (29/30)   
remote: Compressing objects: 100% (30/30)   
remote: Compressing objects: 1remote: 00% (30/30), done.
remote: Total 176 (delta 150), reused 172 (delta 146)
Receiving objects:   0% (1/176)   
Receiving objects:   1% (2/176)   
Receiving objects:   2% (4/176)   
Receiving objects:   3% (6/176)   
Receiving objects:   4% (8/176)   
Receiving objects:   5% (9/176)   
Receiving objects:   6% (11/176)   
Receiving objects:   7% (13/176)   
Receiving objects:   8% (15/176)   
Receiving objects:   9% (16/176)   
Receiving objects:  10% (18/176)   
Receiving objects:  11% (20/176)   
Receiving objects:  12% (22/176)   
Receiving objects:  13% (23/176)   
Receiving objects:  14% (25/176)   
Receiving objects:  15% (27/176)   
Receiving objects:  16% (29/176)   
Receiving objects:  17% (30/176)   
Receiving objects:  18% (32/176)   
Receiving objects:  19% (34/176)   
Receiving objects:  20% (36/176)   
Receiving objects:  21% (37/176)   
Receiving objects:  22% (39/176)   
Receiving objects:  23% (41/176)   
Receiving objects:  24% (43/176)   
Receiving objects:  25% (44/176)   
Receiving objects:  26% (46/176)   
Receiving objects:  27% (48/176)   
Receiving objects:  28% (50/176)   
Receiving objects:  29% (52/176)   
Receiving objects:  30% (53/176)   
Receiving objects:  31% (55/176)   
Receiving objects:  32% (57/176)   
Receiving objects:  33% (59/176)   
Receiving objects:  34% (60/176)   
Receiving objects:  35% (62/176)   
Receiving objects:  36% (64/176)   
Receiving objects:  37% (66/176)   
Receiving objects:  38% (67/176)   
Receiving objects:  39% (69/176)   
Receiving objects:  40% (71/176)   
Receiving objects:  41% (73/176)   
Receiving objects:  42% (74/176)   
Receiving objects:  43% (76/176)   
Receiving objects:  44% (78/176)   
Receiving objects:  45% (80/176)   
Receiving objects:  46% (81/176)   
Receiving objects:  47% (83/176)   
Receiving objects:  48% (85/176)   
Receiving objects:  49% (87/176)   
Receiving objects:  50% (88/176)   
Receiving objects:  51% (90/176)   
Receiving objects:  52% (92/176)   
Receiving objects:  53% (94/176)   
Receiving objects:  54% (96/176)   
Receiving objects:  55% (97/176)   
Receiving objects:  56% (99/176)   
Receiving objects:  57% (101/176)   
Receiving objects:  58% (103/176)   
Receiving objects:  59% (104/176)   
Receiving objects:  60% (106/176)   
Receiving objects:  61% (108/176)   
Receiving objects:  62% (110/176)   
Receiving objects:  63% (111/176)   
Receiving objects:  64% (113/176)   
Receiving objects:  65% (115/176)   
Receiving objects:  66% (117/176)   
Receiving objects:  67% (118/176)   
Receiving objects:  68% (120/176)   
Receiving objects:  69% (122/176)   
Receiving objects:  70% (124/176)   
Receiving objects:  71% (125/176)   
Receiving objects:  72% (127/176)   
Receiving objects:  73% (129/176)   
Receiving objects:  74% (131/176)   
Receiving objects:  75% (132/176)   
Receiving objects:  76% (134/176)   
Receiving objects:  77% (136/176)   
Receiving objects:  78% (138/176)   
Receiving objects:  79% (140/176)   
Receiving objects:  80% (141/176)   
Receiving objects:  81% (143/176)   
Receiving objects:  82% (145/176)   
Receiving objects:  83% (147/176)   
Receiving objects:  84% (148/176)   
Receiving objects:  85% (150/176)   
Receiving objects:  86% (152/176)   
Receiving objects:  87% (154/176)   
Receiving objects:  88% (155/176)   
Receiving objects:  89% (157/176)   
Receiving objects:  90% (159/176)   
Receiving objects:  91% (161/176)   
Receiving objects:  92% (162/176)   
Receiving objects:  93% (164/176)   
Receiving objects:  94% (166/176)   
Receiving objects:  95% (168/176)   
Receiving objects:  96% (169/176)   
Receiving objects:  97% (171/176)   
Receiving objects:  98% (173/176)   
Receiving objects:  99% (175/176)   
Receiving objects: 100% (176/176)   
Receiving objects: 100% (176/176), 27.55 KiB, done.
Resolving deltas:   6% (10/150)   
Resolving deltas:  14% (21/150)   
Resolving deltas:  18% (27/150)   
Resolving deltas:  31% (47/150)   
Resolving deltas:  44% (66/150)   
Resolving deltas:  47% (71/150)   
Resolving deltas:  48% (72/150)   
Resolving deltas:  49% (74/150)   
Resolving deltas:  50% (75/150)   
Resolving deltas:  51% (77/150)   
Resolving deltas:  54% (81/150)   
Resolving deltas:  55% (83/150)   
Resolving deltas:  56% (85/150)   
Resolving deltas:  58% (87/150)   
Resolving deltas:  59% (89/150)   
Resolving deltas:  60% (90/150)   
Resolving deltas:  61% (92/150)   
Resolving deltas:  62% (93/150)   
Resolving deltas:  63% (95/150)   
Resolving deltas:  64% (96/150)   
Resolving deltas:  65% (98/150)   
Resolving deltas:  66% (99/150)   
Resolving deltas:  67% (101/150)   
Resolving deltas:  68% (102/150)   
Resolving deltas:  69% (104/150)   
Resolving deltas:  70% (105/150)   
Resolving deltas:  71% (107/150)   
Resolving deltas:  72% (108/150)   
Resolving deltas:  73% (110/150)   
Resolving deltas:  74% (111/150)   
Resolving deltas:  76% (114/150)   
Resolving deltas:  77% (116/150)   
Resolving deltas:  78% (117/150)   
Resolving deltas:  79% (119/150)   
Resolving deltas:  80% (121/150)   
Resolving deltas:  81% (122/150)   
Resolving deltas:  82% (123/150)   
Resolving deltas:  83% (125/150)   
Resolving deltas:  84% (126/150)   
Resolving deltas:  85% (128/150)   
Resolving deltas:  88% (132/150)   
Resolving deltas:  89% (134/150)   
Resolving deltas:  90% (136/150)   
Resolving deltas:  92% (138/150)   
Resolving deltas:  93% (140/150)   
Resolving deltas:  94% (141/150)   
Resolving deltas:  95% (143/150)   
Resolving deltas:  96% (144/150)   
Resolving deltas:  97% (146/150)   
Resolving deltas:  98% (147/150)   
Resolving deltas:  99% (149/150)   
Resolving deltas: 100% (150/150)   
Resolving deltas: 100% (150/150), completed with 63 local objects.
From /pub/scm/linux/kernel/git/roland/infiniband
 + f8fc616...a1dcf69 for-2.6.26 -> infiniband  (forced update)
Switched to branch "infiniband"
Finished one revert.
Switched to branch "2.6.25-rc5-mc5"
Already on branch "2.6.25-rc5-mc5"
Automatic merge failed; fix conflicts and then commit the result.
From /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
   29ea517..dba92d3  release    -> acpi
remote: Counting objects: 68, done.
remote: Compressing objects:   4% (1/22)   
remote: Compressing objects:   9% (2/22)   
remote: Compressing objects:  13% (3remote: /22)   
remote: Compressing objects:  18% (4/22)   
remote: Compressing objects:  22% (5/22)   
remote: Compressing objects:  27% (6/22)   
remote: Compressing remote: objects:  31% (7/22)   
remote: Compressing objects:  36% (8/22)   
remote: Compressing objects:  40% (9/22)   
remote: Compressing objects:  45% (10/22)   
remote: Compressing objects:  50% (11/22)   
remote: Compressing objects:  54% (12/22)   
remote: Compressing objects:  59% (13/22)   
remote: Compressing objects:  63% (14/22)   
remote: Compressing objects:  68% (15/22)   
remote: Compressing objects:  72% (16/22)   
remote: Compressing objects:  77% (17/22)   
remote: Compressing objects:  81% (18/22)   
remote: Compressing objects:  86% (19/22)   
remote: Compressing objects:  90% (20/22)   
remote: Compressing objects:  95% (21/22)   
remote: Compressing objects: 100% (22/22)   
remote: Compressing objecremote: ts: 100% (22/22), done.
remote: Total 57 (delta 44), reused 46 (delta 35)
From /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
   855c603..f5101d5  for-linus  -> ieee1394-for-linus
remote: Counting objects: 1   
remote: Counting objects: 279, done.
remote: Compressing objects:   1% (1/68)   
remote: Compressing objects:   2% (2/68)   
remote: Compressing objects:   4% (3/68)   
remote: Compressing objects:   5% (4/68)   
remote: Compressing objects:   7% (5/68)   
remote: Compressing objects:remote:    8% (6/68)   
remote: Compressing objects:  10% (7/68)   
remote: Compressing objects:  11% (8/68)   
remote: Compressing objects:  13% (9/68)   
remote: Compressing objects:  14% (10/68)   
remote: Compressing objects:  16% (11/68)   
remote: Compressing objects:  17% (12/68)   
remote: Compressing objects:  19% (13/68)   
remote: Compressing objects:  20% (14/68)   
remote: Compressing objects:  22% (15/68)   
remote: Compressing objects:  23% (16/68)   
remote: Compressing objects:  25% (17/68)   
remote: Compressing objects:  26% (18/68)   
remote: Compressing objects:  27% (19/68)   
remote: Compressing objects:  29% (20/68)   
remote: Compressing objects:  30% (21/68)   
remote: Compressing objects:  32% (22/68)   
remote: Compressing objects:  33% (23/68)   
remote: Compressing objects:  35% (24/68)   
remote: Compressing objects:  36% (25/68)   
remote: Compressing objects:  38% (26/68)   
remote: Compressing objects:  39% (27/68)   
remote: Compressing objects:  41% (28/68)   
remote: Compressing objects:  42% (29/68)   
remote: Compressing objects:  44% (30/68)   
remote: Compressing objects:  45% (31/68)   
remote: Compressing objects:  47% (32/68)   
remote: Compressing objects:  48% (33/68)   
remote: Compressing objects:  50% (34/68)   
remote: Compressing objects:  51% (35/68)   
remote: Compressing objects:  52% (36/68)   
remote: Compressing objects:  54% (37/68)   
remote: Compressing objects:  55% (38/68)   
remote: Compressing objects:  57% (39/68)   
remote: Compressing objects:  58% (40/68)   
remote: Compressing objects:  60% (41/68)   
remote: Compressing objects:  61% (42/68)   
remote: Compressing objects:  63% (43/68)   
remote: Compressing objects:  64% (44/68)   
remote: Compressing objects:  66% (45/68)   
remote: Compressing objects:  67% (46/68)   
remote: Compressing objects:  69% (47/68)   
remote: Compressing objects:  70% (48/68)   
remote: Compressing objects:  72% (49/68)   
remote: Compressing objects:  73% (50/68)   
remote: Compressing objects:  75% (51/68)   
remote: Compressing objects:  76% (52/68)   
remote: Compressing objects:  77% (53/68)   
remote: Compressing objects:  79% (54/68)   
remote: Compressing objects:  80% (55/68)   
remote: Compressing objects:  82% (56/68)   
remote: Compressing objects:  83% (57/68)   
remote: Compressing objects:  85% (58/68)   
remote: Compressing objects:  86% (59/68)   
remote: Compressing objects:  88% (60/68)   
remote: Compressing objects:  89% (61/68)   
remote: Compressing objects:  91% (62/68)   
remote: Compressing objects:  92% (63/68)   
remote: Compressing objects:  94% (64/68)   
remote: Compressing objects:  95% (65/68)   
remote: Compressing objects:  97% (66/68)   
remote: Compressing objects:  98% (67/68)   
remote: Compressing objects: 100% (68/68)   
remote: Compressing objects: 100% (68/68), done.
remote: Total 225 (delta 186), reused 191 (delta 157)
Receiving objects:   0% (1/225)   
Receiving objects:   1% (3/225)   
Receiving objects:   2% (5/225)   
Receiving objects:   3% (7/225)   
Receiving objects:   4% (9/225)   
Receiving objects:   5% (12/225)   
Receiving objects:   6% (14/225)   
Receiving objects:   7% (16/225)   
Receiving objects:   8% (18/225)   
Receiving objects:   9% (21/225)   
Receiving objects:  10% (23/225)   
Receiving objects:  11% (25/225)   
Receiving objects:  12% (27/225)   
Receiving objects:  13% (30/225)   
Receiving objects:  14% (32/225)   
Receiving objects:  15% (34/225)   
Receiving objects:  16% (36/225)   
Receiving objects:  17% (39/225)   
Receiving objects:  18% (41/225)   
Receiving objects:  19% (43/225)   
Receiving objects:  20% (45/225)   
Receiving objects:  21% (48/225)   
Receiving objects:  22% (50/225)   
Receiving objects:  23% (52/225)   
Receiving objects:  24% (54/225)   
Receiving objects:  25% (57/225)   
Receiving objects:  26% (59/225)   
Receiving objects:  27% (61/225)   
Receiving objects:  28% (63/225)   
Receiving objects:  29% (66/225)   
Receiving objects:  30% (68/225)   
Receiving objects:  31% (70/225)   
Receiving objects:  32% (72/225)   
Receiving objects:  33% (75/225)   
Receiving objects:  34% (77/225)   
Receiving objects:  35% (79/225)   
Receiving objects:  36% (81/225)   
Receiving objects:  37% (84/225)   
Receiving objects:  38% (86/225)   
Receiving objects:  39% (88/225)   
Receiving objects:  40% (90/225)   
Receiving objects:  41% (93/225)   
Receiving objects:  42% (95/225)   
Receiving objects:  43% (97/225)   
Receiving objects:  44% (99/225)   
Receiving objects:  45% (102/225)   
Receiving objects:  46% (104/225)   
Receiving objects:  47% (106/225)   
Receiving objects:  48% (108/225)   
Receiving objects:  49% (111/225)   
Receiving objects:  50% (113/225)   
Receiving objects:  51% (115/225)   
Receiving objects:  52% (117/225)   
Receiving objects:  53% (120/225)   
Receiving objects:  54% (122/225)   
Receiving objects:  55% (124/225)   
Receiving objects:  56% (126/225)   
Receiving objects:  57% (129/225)   
Receiving objects:  58% (131/225)   
Receiving objects:  59% (133/225)   
Receiving objects:  60% (135/225)   
Receiving objects:  61% (138/225)   
Receiving objects:  62% (140/225)   
Receiving objects:  63% (142/225)   
Receiving objects:  64% (144/225)   
Receiving objects:  65% (147/225)   
Receiving objects:  66% (149/225)   
Receiving objects:  67% (151/225)   
Receiving objects:  68% (153/225)   
Receiving objects:  69% (156/225)   
Receiving objects:  70% (158/225)   
Receiving objects:  71% (160/225)   
Receiving objects:  72% (162/225)   
Receiving objects:  73% (165/225)   
Receiving objects:  74% (167/225)   
Receiving objects:  75% (169/225)   
Receiving objects:  76% (171/225)   
Receiving objects:  77% (174/225)   
Receiving objects:  78% (176/225)   
Receiving objects:  79% (178/225)   
Receiving objects:  80% (180/225)   
Receiving objects:  81% (183/225)   
Receiving objects:  82% (185/225)   
Receiving objects:  83% (187/225)   
Receiving objects:  84% (189/225)   
Receiving objects:  85% (192/225)   
Receiving objects:  86% (194/225)   
Receiving objects:  87% (196/225)   
Receiving objects:  88% (198/225)   
Receiving objects:  89% (201/225)   
Receiving objects:  90% (203/225)   
Receiving objects:  91% (205/225)   
Receiving objects:  92% (207/225)   
Receiving objects:  93% (210/225)   
Receiving objects:  94% (212/225)   
Receiving objects:  95% (214/225)   
Receiving objects:  96% (216/225)   
Receiving objects:  97% (219/225)   
Receiving objects:  98% (221/225)   
Receiving objects:  99% (223/225)   
Receiving objects: 100% (225/225)   
Receiving objects: 100% (225/225), 35.22 KiB, done.
Resolving deltas:   0% (1/186)   
Resolving deltas:   1% (2/186)   
Resolving deltas:   2% (4/186)   
Resolving deltas:   6% (12/186)   
Resolving deltas:  20% (38/186)   
Resolving deltas:  23% (43/186)   
Resolving deltas:  24% (45/186)   
Resolving deltas:  41% (78/186)   
Resolving deltas:  43% (81/186)   
Resolving deltas:  44% (82/186)   
Resolving deltas:  45% (85/186)   
Resolving deltas:  46% (87/186)   
Resolving deltas:  47% (89/186)   
Resolving deltas:  50% (94/186)   
Resolving deltas:  51% (96/186)   
Resolving deltas:  52% (97/186)   
Resolving deltas:  53% (99/186)   
Resolving deltas:  54% (102/186)   
Resolving deltas:  58% (109/186)   
Resolving deltas:  59% (110/186)   
Resolving deltas:  60% (112/186)   
Resolving deltas:  61% (114/186)   
Resolving deltas:  62% (117/186)   
Resolving deltas:  63% (118/186)   
Resolving deltas:  65% (122/186)   
Resolving deltas:  66% (123/186)   
Resolving deltas:  67% (125/186)   
Resolving deltas:  72% (135/186)   
Resolving deltas:  83% (155/186)   
Resolving deltas:  88% (165/186)   
Resolving deltas:  93% (173/186)   
Resolving deltas:  97% (181/186)   
Resolving deltas:  99% (185/186)   
Resolving deltas: 100% (186/186)   
Resolving deltas: 100% (186/186), completed with 34 local objects.
From /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
   5de9be4..4d56e82  master     -> ieee1394
remote: Generating pack...
remote: Done counting 25 objects.
remote: Result has 14 objects.
remote: Deltifying 14 objects.
remote:    7% (1/14) done
remote:   14% (2/14) done
remote:   21% (3/14) done
remote:   remote: 28% (4/14) done
remote:   35% (5/14) done
remote:   42% (6/14) done
remote:   50% (7/14) done
remote:   57% (8/14) done
remote:   64% (9/14) done
remote:   71% (10/14) done
remote:   7remote: 8% (11/14) done
remote:   85% (12/14) done
remote:   92% (13/14) done
remote:  100% (14/14) done
remote: 
remote: Total 14 (delta 12), reused 8 (delta 6)
From git://git390.osdl.marist.edu/pub/scm/linux-2.6
 + ce6d838...ae0a25f for-linus  -> s390-linus  (forced update)
remote: Generating pack...
remote: Done counting 178 objects.
remote: Result has 125 objects.
remote: Deltifying 125 objects.
remote:    0% (1/125) done
remote:    1% (2/125) done
remote:    2% (3/125) done
remote:    3% (4/125) done
remote:    4remote: % (5/125) done
remote:    5% (7/125) done
remote:    6% (8/125) done
remote:    7% (9/125) done
remote:    8% (10/125) done
remote:    9% (12/125) done
remote:   10% (13/125) dremote: one
remote:   11% (14/125) done
remote:   12% (15/125) done
remote:   13% (17/125) done
remote:   14% (18/125) done
remote:   15% (19/125) done
remote:   16% (20/125) done
remote:   17remote: % (22/125) done
remote:   18% (23/125) done
remote:   19% (24/125) done
remote:   20% (25/125) done
remote:   21% (27/125) done
remote:   22% (28/125) done
remote:   23% (29/12remote: 5) done
remote:   24% (30/125) done
remote:   25% (32/125) done
remote:   26% (33/125) done
remote:   27% (34/125) done
remote:   28% (35/125) done
remote:   29% (37/125) done
remote:   30% (38/125) done
remote:   31% (39/125) done
remote:   32% (40/125) done
remote:   33% (42/125) done
remote:   34% (43/125) done
remote:   35% (44/125) done
remote:   36% (4remote: 5/125) done
remote:   37% (47/125) done
remote:   38% (48/125) done
remote:   39% (49/125) done
remote:   40% (50/125) done
remote:   41% (52/125) done
remote:   42% (53/125) dremote: one
remote:   43% (54/125) done
remote:   44% (55/125) done
remote:   45% (57/125) done
remote:   46% (58/125) done
remote:   47% (59/125) done
remote:   48% (60/125) done
remote:   49remote: % (62/125) done
remote:   50% (63/125) done
remote:   51% (64/125) done
remote:   52% (65/125) done
remote:   53% (67/125) done
remote:   54% (68/125) done
remote:   55% (69/12remote: 5) done
remote:   56% (70/125) done
remote:   57% (72/125) done
remote:   58% (73/125) done
remote:   59% (74/125) done
remote:   60% (75/125) done
remote:   61% (77/125) done
remote:   62% (78/125) done
remote:   63% (79/125) done
remote:   64% (80/125) done
remote:   65% (82/125) done
remote:   66% (83/125) done
remote:   67% (84/125) done
remote:   68% (85/125) done
remote:   69% (87/125) done
remote:   70% (88/125) done
remote:   71% (89/125) done
remote:   72% (90/125) done
remote:   73% (92/125) done
remote:   74% (93/125) done
remote:   75% (94/125) done
remote:   76% (95/125) done
remote:   77% (97/125) done
remote:   78% (98/125) done
remote:   79% (99/125) done
remote:   80% (100/125) done
remote:   81% (102/125) done
remote:   82% remote: (103/125) done
remote:   83% (104/125) done
remote:   84% (105/125) done
remote:   85% (107/125) done
remote:   86% (108/125) done
remote:   87% (109/125) done
remote:   88% (1remote: 10/125) done
remote:   89% (112/125) done
remote:   90% (113/125) done
remote:   91% (114/125) done
remote:   92% (115/125) done
remote:   93% (117/125) done
remote:   94% (118/125) done
remote:   95% (119/125) done
remote:   remote: 96% (120/125) done
remote:   97% (122/125) done
remote:   98% (123/125) done
remote:   99% (124/125) done
remote:  100% (125/125) done
remote: 
Receiving objects:   0% (1/125)   
Receiving objects:   1% (2/125)   
Receiving objects:   2% (3/125)   
Receiving objects:   3% (4/125)   
Receiving objects:   4% (5/125)   
Receiving objects:   5% (7/125)   
Receiving objects:   6% (8/125)   
Receiving objects:   7% (9/125)   
Receiving objects:   8% (10/125)   
Receiving objects:   9% (12/125)   
Receiving objects:  10% (13/125)   
Receiving objects:  11% (14/125)   
Receiving objects:  12% (15/125)   
Receiving objects:  13% (17/125)   
Receiving objects:  14% (18/125)   
Receiving objects:  15% (19/125)   
Receiving objects:  16% (20/125)   
Receiving objects:  17% (22/125)   
Receiving objects:  18% (23/125)   
Receiving objects:  19% (24/125)   
Receiving objects:  20% (25/125)   
Receiving objects:  21% (27/125)   
Receiving objects:  22% (28/125)   
Receiving objects:  23% (29/125)   
Receiving objects:  24% (30/125)   
Receiving objects:  25% (32/125)   
Receiving objects:  26% (33/125)   
Receiving objects:  27% (34/125)   
Receiving objects:  28% (35/125)   
Receiving objects:  29% (37/125)   
Receiving objects:  30% (38/125)   
Receiving objects:  31% (39/125)   
Receiving objects:  32% (40/125)   
Receiving objects:  33% (42/125)   
Receiving objects:  34% (43/125)   
Receiving objects:  35% (44/125)   
Receiving objects:  36% (45/125)   
Receiving objects:  37% (47/125)   
Receiving objects:  38% (48/125)   
Receiving objects:  39% (49/125)   
Receiving objects:  40% (50/125)   
Receiving objects:  41% (52/125)   
Receiving objects:  42% (53/125)   
Receiving objects:  43% (54/125)   
Receiving objects:  44% (55/125)   
Receiving objects:  45% (57/125)   
Receiving objects:  46% (58/125)   
remote: Total 125 (delta 108), reused 95 (delta 78)
Receiving objects:  47% (59/125)   
Receiving objects:  48% (60/125)   
Receiving objects:  49% (62/125)   
Receiving objects:  50% (63/125)   
Receiving objects:  51% (64/125)   
Receiving objects:  52% (65/125)   
Receiving objects:  53% (67/125)   
Receiving objects:  54% (68/125)   
Receiving objects:  55% (69/125)   
Receiving objects:  56% (70/125)   
Receiving objects:  57% (72/125)   
Receiving objects:  58% (73/125)   
Receiving objects:  59% (74/125)   
Receiving objects:  60% (75/125)   
Receiving objects:  61% (77/125)   
Receiving objects:  62% (78/125)   
Receiving objects:  63% (79/125)   
Receiving objects:  64% (80/125)   
Receiving objects:  65% (82/125)   
Receiving objects:  66% (83/125)   
Receiving objects:  67% (84/125)   
Receiving objects:  68% (85/125)   
Receiving objects:  69% (87/125)   
Receiving objects:  70% (88/125)   
Receiving objects:  71% (89/125)   
Receiving objects:  72% (90/125)   
Receiving objects:  73% (92/125)   
Receiving objects:  74% (93/125)   
Receiving objects:  75% (94/125)   
Receiving objects:  76% (95/125)   
Receiving objects:  77% (97/125)   
Receiving objects:  78% (98/125)   
Receiving objects:  79% (99/125)   
Receiving objects:  80% (100/125)   
Receiving objects:  81% (102/125)   
Receiving objects:  82% (103/125)   
Receiving objects:  83% (104/125)   
Receiving objects:  84% (105/125)   
Receiving objects:  85% (107/125)   
Receiving objects:  86% (108/125)   
Receiving objects:  87% (109/125)   
Receiving objects:  88% (110/125)   
Receiving objects:  89% (112/125)   
Receiving objects:  90% (113/125)   
Receiving objects:  91% (114/125)   
Receiving objects:  92% (115/125)   
Receiving objects:  93% (117/125)   
Receiving objects:  94% (118/125)   
Receiving objects:  95% (119/125)   
Receiving objects:  96% (120/125)   
Receiving objects:  97% (122/125)   
Receiving objects:  98% (123/125)   
Receiving objects:  99% (124/125)   
Receiving objects: 100% (125/125)   
Receiving objects: 100% (125/125), 22.73 KiB, done.
Resolving deltas:   0% (1/108)   
Resolving deltas:   1% (2/108)   
Resolving deltas:  13% (15/108)   
Resolving deltas:  17% (19/108)   
Resolving deltas:  21% (23/108)   
Resolving deltas:  22% (24/108)   
Resolving deltas:  24% (26/108)   
Resolving deltas:  27% (30/108)   
Resolving deltas:  28% (31/108)   
Resolving deltas:  29% (32/108)   
Resolving deltas:  30% (33/108)   
Resolving deltas:  33% (36/108)   
Resolving deltas:  35% (38/108)   
Resolving deltas:  36% (39/108)   
Resolving deltas:  37% (40/108)   
Resolving deltas:  38% (42/108)   
Resolving deltas:  44% (48/108)   
Resolving deltas:  45% (49/108)   
Resolving deltas:  46% (50/108)   
Resolving deltas:  47% (51/108)   
Resolving deltas:  48% (52/108)   
Resolving deltas:  49% (53/108)   
Resolving deltas:  50% (54/108)   
Resolving deltas:  54% (59/108)   
Resolving deltas:  55% (60/108)   
Resolving deltas:  56% (61/108)   
Resolving deltas:  57% (62/108)   
Resolving deltas:  58% (63/108)   
Resolving deltas:  59% (64/108)   
Resolving deltas:  60% (65/108)   
Resolving deltas:  61% (66/108)   
Resolving deltas:  62% (67/108)   
Resolving deltas:  63% (69/108)   
Resolving deltas:  64% (70/108)   
Resolving deltas:  65% (71/108)   
Resolving deltas:  73% (79/108)   
Resolving deltas:  76% (83/108)   
Resolving deltas:  77% (84/108)   
Resolving deltas:  78% (85/108)   
Resolving deltas:  79% (86/108)   
Resolving deltas:  81% (88/108)   
Resolving deltas:  84% (91/108)   
Resolving deltas:  85% (92/108)   
Resolving deltas:  88% (96/108)   
Resolving deltas:  90% (98/108)   
Resolving deltas:  91% (99/108)   
Resolving deltas:  92% (100/108)   
Resolving deltas:  94% (102/108)   
Resolving deltas:  96% (104/108)   
Resolving deltas:  98% (106/108)   
Resolving deltas: 100% (108/108)   
Resolving deltas: 100% (108/108), completed with 51 local objects.
From git://git390.osdl.marist.edu/pub/scm/linux-2.6
 + 3fbe1a1...333e030 features   -> s390  (forced update)
error: branch 'selinux' not found.
remote: Counting objects: 2651, done.
remote: Compressing objects:   0% (1/340)   
remote: Compressing objects:   1% (4/340)   
remote: Compressing objects:   2% (7/340)   
remote: Compressing objects:   3% (11/340)   
remote: Compressing objects:   4% (14/340)   
remote: Compressing objects:   5% (17/340)   
remote: Compressing objects:   6% (21/340)   
remote: Compressing objects:   7% (24/340)   
remote: Compressing objects:   8% (28/340)   
remote: Compressing objects:   9% (31/340)   
remote: Compressing objects:  10% (34/340)   
remote: Compressing objects:  11% (38/340)   
remote: Compressing objects:  12% (41/340)   
remote: Compressing objects:  13% (45/340)   
remote: Compressing objects:  14% (48/340)   
remote: Compressing objects:  15% (51/340)   
remote: Compressing objects:  16% (55/340)   
remote: Compressing objects:  17% (58/340)   
remote: Compressing objects:  18% (62/340)   
remote: Compressing objects:  19% (65/340)   
remote: Compressing objects:  20% (68/340)   
remote: Compressing objects:  21% (72/340)   
remote: Compressing objects:  22% (75/340)   
remote: Compressing objects:  23% (79/340)   
remote: Compressing objects:  24% (82/340)   
remote: Compressing objects:  25% (85/340)   
remote: Compressing objects:  26% (89/340)   
remote: Compressing objects:  27% (92/340)   
remote: Compressing objects:  28% (96/340)   
remote: Compressing objects:  29% (99/340)   
remote: Compressing objects:  30% (102/340)   
remote: Compressing objects:  31% (106/340)   
remote: Compressing objects:  32% (109/340)   
remote: Compressing objects:  33% (113/340)   
remote: Compressing objects:  34% (116/340)   
remote: Compressing objects:  35% (119/340)   
remote: Compressing objects:  36% (123/340)   
remote: Compressing objects:  37% (126/340)   
remote: Compressing objects:  38% (130/340)   
remote: Compressing objects:  39% (133/340)   
remote: Compressing objects:  40% (136/340)   
remote: Compressing objects:  41% (140/340)   
remote: Compressing objects:  42% (143/340)   
remote: Compressing objects:  43% (147/340)   
remote: Compressing objects:  44% (150/340)   
remote: Compressing objects:  45% (153/340)   
remote: Compressing objects:  46% (157/340)   
remote: Compressing objects:  47% (160/340)   
remote: Compressing objects:  48% (164/340)   
remote: Compressing objects:  49% (167/340)   
remote: Compressing objects:  50% (170/340)   
remote: Compressing objects:  51% (174/340)   
remote: Compressing objects:  52% (177/340)   
remote: Compressing objects:  53% (181/340)   
remote: Compressing objects:  54% (184/340)   
remote: Compressing objects:  55% (187/340)   
remote: Compressing objects:  56% (191/340)   
remote: Compressing objects:  57% (194/340)   
remote: Compressing objects:  58% (198/340)   
remote: Compressing objects:  59% (201/340)   
remote: Compressing objects:  60% (204/340)   
remote: Compressing objects:  61% (208/340)   
remote: Compressing objects:  62% (211/340)   
remote: Compressing objects:  63% (215/340)   
remote: Compressing objects:  64% (218/340)   
remote: Compressing objects:  65% (221/340)   
remote: Compressing objects:  66% (225/340)   
remote: Compressing objects:  67% (228/340)   
remote: Compressing objects:  68% (232/340)   
remote: Compressing objects:  69% (235/340)   
remote: Compressing objects:  70% (238/340)   
remote: Compressing objects:  71% (242/340)   
remote: Compressing objects:  72% (245/340)   
remote: Compressing objects:  73% (249/340)   
remote: Compressing objects:  74% (252/340)   
remote: Compressing objects:  75% (255/340)   
remote: Compressing objects:  76% (259/340)   
remote: Compressing objects:  77% (262/340)   
remote: Compressing objects:  78% (266/340)   
remote: Compressing objects:  79% (269/340)   
remote: Compressing objects:  80% (272/340)   
remote: Compressing objects:  81% (276/340)   
remote: Compressing objects:  82% (279/340)   
remote: Compressing objects:  83% (283/340)   
remote: Compressing objects:  84% (286/340)   
remote: Compressing objects:  85% (289/340)   
remote: Compressing objects:  86% (293/340)   
remote: Compressing objects:  87% (296/340)   
remote: Compressing objects:  88% (300/340)   
remote: Compressing objects:  89% (303/340)   
remote: Compressing objects:  90% (306/340)   
remote: Compressing objects:  91% (310/340)   
remote: Compressing objects:  92% (313/340)   
remote: Compressing objects:  93% (317/340)   
remote: Compressing objects:  94% (320/340)   
remote: Compressing objects:  95% (323/340)   
remote: Compressing objects:  96% (327/340)   
remote: Compressing objects:  97% (330/340)   
remote: Compressing objects:  98% (334/340)   
remote: Compressing objects:  99% (337/340)   
remote: Compressing objects: 100% (340/340)   
remote: Compressing objects: 100% (340/340), done.
Receiving objects:   0% (1/2320)   
Receiving objects:   1% (24/2320)   
Receiving objects:   2% (47/2320)   
Receiving objects:   3% (70/2320)   
Receiving objects:   4% (93/2320)   
Receiving objects:   5% (116/2320)   
Receiving objects:   6% (140/2320)   
Receiving objects:   7% (163/2320)   
Receiving objects:   8% (186/2320)   
Receiving objects:   9% (209/2320)   
Receiving objects:  10% (232/2320)   
Receiving objects:  11% (256/2320)   
Receiving objects:  12% (279/2320)   
Receiving objects:  13% (302/2320)   
Receiving objects:  14% (325/2320)   
Receiving objects:  15% (348/2320)   
Receiving objects:  16% (372/2320)   
Receiving objects:  17% (395/2320)   
Receiving objects:  18% (418/2320)   
Receiving objects:  19% (441/2320)   
Receiving objects:  20% (464/2320)   
Receiving objects:  21% (488/2320)   
Receiving objects:  22% (511/2320)   
Receiving objects:  23% (534/2320)   
Receiving objects:  24% (557/2320)   
Receiving objects:  25% (580/2320)   
Receiving objects:  26% (604/2320)   
Receiving objects:  27% (627/2320)   
Receiving objects:  28% (650/2320)   
Receiving objects:  29% (673/2320)   
Receiving objects:  30% (696/2320)   
Receiving objects:  31% (720/2320)   
Receiving objects:  32% (743/2320)   
remote: Total 2320 (delta 1978), reused 2320 (delta 1978)
Receiving objects:  33% (766/2320)   
Receiving objects:  34% (789/2320)   
Receiving objects:  35% (812/2320)   
Receiving objects:  36% (836/2320)   
Receiving objects:  37% (859/2320)   
Receiving objects:  38% (882/2320)   
Receiving objects:  39% (905/2320)   
Receiving objects:  40% (928/2320)   
Receiving objects:  41% (952/2320)   
Receiving objects:  42% (975/2320)   
Receiving objects:  43% (998/2320)   
Receiving objects:  44% (1021/2320)   
Receiving objects:  45% (1044/2320)   
Receiving objects:  46% (1068/2320)   
Receiving objects:  47% (1091/2320)   
Receiving objects:  48% (1114/2320)   
Receiving objects:  49% (1137/2320)   
Receiving objects:  50% (1160/2320)   
Receiving objects:  51% (1184/2320)   
Receiving objects:  52% (1207/2320)   
Receiving objects:  53% (1230/2320)   
Receiving objects:  54% (1253/2320)   
Receiving objects:  55% (1276/2320)   
Receiving objects:  56% (1300/2320)   
Receiving objects:  57% (1323/2320)   
Receiving objects:  58% (1346/2320)   
Receiving objects:  59% (1369/2320)   
Receiving objects:  60% (1392/2320)   
Receiving objects:  61% (1416/2320)   
Receiving objects:  62% (1439/2320)   
Receiving objects:  63% (1462/2320)   
Receiving objects:  64% (1485/2320)   
Receiving objects:  65% (1508/2320)   
Receiving objects:  66% (1532/2320)   
Receiving objects:  67% (1555/2320)   
Receiving objects:  68% (1578/2320)   
Receiving objects:  69% (1601/2320)   
Receiving objects:  70% (1624/2320)   
Receiving objects:  71% (1648/2320)   
Receiving objects:  72% (1671/2320)   
Receiving objects:  73% (1694/2320)   
Receiving objects:  74% (1717/2320)   
Receiving objects:  75% (1740/2320)   
Receiving objects:  76% (1764/2320)   
Receiving objects:  77% (1787/2320)   
Receiving objects:  78% (1810/2320)   
Receiving objects:  79% (1833/2320)   
Receiving objects:  80% (1856/2320)   
Receiving objects:  81% (1880/2320)   
Receiving objects:  82% (1903/2320)   
Receiving objects:  83% (1926/2320)   
Receiving objects:  84% (1949/2320)   
Receiving objects:  85% (1972/2320)   
Receiving objects:  86% (1996/2320)   
Receiving objects:  87% (2019/2320)   
Receiving objects:  88% (2042/2320)   
Receiving objects:  89% (2065/2320)   
Receiving objects:  90% (2088/2320)   
Receiving objects:  91% (2112/2320)   
Receiving objects:  92% (2135/2320)   
Receiving objects:  93% (2158/2320)   
Receiving objects:  94% (2181/2320)   
Receiving objects:  95% (2204/2320)   
Receiving objects:  96% (2228/2320)   
Receiving objects:  97% (2251/2320)   
Receiving objects:  98% (2274/2320)   
Receiving objects:  99% (2297/2320)   
Receiving objects: 100% (2320/2320)   
Receiving objects: 100% (2320/2320), 408.43 KiB, done.
Resolving deltas:   0% (1/1978)   
Resolving deltas:   4% (83/1978)   
Resolving deltas:  10% (201/1978)   
Resolving deltas:  11% (234/1978)   
Resolving deltas:  12% (243/1978)   
Resolving deltas:  14% (284/1978)   
Resolving deltas:  15% (299/1978)   
Resolving deltas:  16% (324/1978)   
Resolving deltas:  20% (403/1978)   
Resolving deltas:  21% (421/1978)   
Resolving deltas:  24% (485/1978)   
Resolving deltas:  39% (784/1978)   
Resolving deltas:  40% (792/1978)   
Resolving deltas:  52% (1043/1978)   
Resolving deltas:  53% (1049/1978)   
Resolving deltas:  54% (1071/1978)   
Resolving deltas:  55% (1088/1978)   
Resolving deltas:  56% (1108/1978)   
Resolving deltas:  57% (1128/1978)   
Resolving deltas:  58% (1153/1978)   
Resolving deltas:  59% (1171/1978)   
Resolving deltas:  60% (1187/1978)   
Resolving deltas:  61% (1208/1978)   
Resolving deltas:  62% (1227/1978)   
Resolving deltas:  63% (1247/1978)   
Resolving deltas:  64% (1276/1978)   
Resolving deltas:  65% (1294/1978)   
Resolving deltas:  66% (1310/1978)   
Resolving deltas:  67% (1328/1978)   
Resolving deltas:  68% (1346/1978)   
Resolving deltas:  69% (1366/1978)   
Resolving deltas:  70% (1385/1978)   
Resolving deltas:  71% (1405/1978)   
Resolving deltas:  72% (1426/1978)   
Resolving deltas:  73% (1444/1978)   
Resolving deltas:  74% (1464/1978)   
Resolving deltas:  79% (1573/1978)   
Resolving deltas:  80% (1583/1978)   
Resolving deltas:  81% (1603/1978)   
Resolving deltas:  82% (1622/1978)   
Resolving deltas:  83% (1651/1978)   
Resolving deltas:  84% (1664/1978)   
Resolving deltas:  85% (1693/1978)   
Resolving deltas:  86% (1702/1978)   
Resolving deltas:  87% (1723/1978)   
Resolving deltas:  88% (1741/1978)   
Resolving deltas:  89% (1761/1978)   
Resolving deltas:  90% (1785/1978)   
Resolving deltas:  91% (1801/1978)   
Resolving deltas:  97% (1927/1978)   
Resolving deltas:  99% (1975/1978)   
Resolving deltas: 100% (1978/1978)   
Resolving deltas: 100% (1978/1978), completed with 310 local objects.
From /pub/scm/linux/kernel/git/x86/linux-2.6-x86
 + 6b46fb1...21a4184 master     -> x86  (forced update)
Already on branch "2.6.25-rc5-mc5"
Automatic merge failed; fix conflicts and then commit the result.
From /pub/scm/linux/kernel/git/aegl/linux-2.6
   cdeeeae..93d7446  release    -> ia64-release
Switched to branch "doc"
Switched to branch "2.6.25-rc5-mc5"
Already on branch "2.6.25-rc5-mc5"
Already on branch "2.6.25-rc5-mc5"
Already on branch "2.6.25-rc5-mc5"
    |   10 -
 drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h      |    9 +
 drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h |   20 +-
 drivers/media/video/pvrusb2/pvrusb2-hdw.c          |  394 ++++-
 drivers/media/video/pvrusb2/pvrusb2-hdw.h          |   23 +-
 drivers/media/video/pvrusb2/pvrusb2-i2c-core.c     |    2 +-
 drivers/media/video/pvrusb2/pvrusb2-std.c          |    9 +-
 drivers/media/video/pvrusb2/pvrusb2-sysfs.c        |    4 +
 drivers/media/video/pvrusb2/pvrusb2-v4l2.c         |  186 ++-
 drivers/media/video/pwc/pwc-if.c                   |    8 +-
 drivers/media/video/pxa_camera.c                   |  985 +++++++++++
 drivers/media/video/saa6588.c                      |    8 +-
 drivers/media/video/saa7110.c                      |    2 +-
 drivers/media/video/saa7111.c                      |    2 +-
 drivers/media/video/saa7114.c                      |    2 +-
 drivers/media/video/saa7115.c                      |    4 +-
 drivers/media/video/saa711x.c                      |    2 +-
 drivers/media/video/saa7134/saa7134-alsa.c         |   12 +-
 drivers/media/video/saa7134/saa7134-cards.c        |  364 ++++-
 drivers/media/video/saa7134/saa7134-core.c         |   48 +-
 drivers/media/video/saa7134/saa7134-dvb.c          |  122 ++-
 drivers/media/video/saa7134/saa7134-empress.c      |    6 +-
 drivers/media/video/saa7134/saa7134-i2c.c          |    4 +-
 drivers/media/video/saa7134/saa7134-input.c        |    6 +-
 drivers/media/video/saa7134/saa7134-ts.c           |    2 +-
 drivers/media/video/saa7134/saa7134-tvaudio.c      |    6 +-
 drivers/media/video/saa7134/saa7134-vbi.c          |    2 +-
 drivers/media/video/saa7134/saa7134-video.c        |   10 +-
 drivers/media/video/saa7134/saa7134.h              |   16 +-
 drivers/media/video/saa7185.c                      |    2 +-
 drivers/media/video/se401.c                        |    2 +-
 drivers/media/video/sn9c102/sn9c102_core.c         |    4 +-
 drivers/media/video/sn9c102/sn9c102_sensor.h       |    2 +-
 drivers/media/video/soc_camera.c                   |  998 ++++++++++++
 drivers/media/video/stk-webcam.c                   |    4 +-
 drivers/media/video/stradis.c                      |    4 +-
 drivers/media/video/stv680.c                       |    9 +-
 drivers/media/video/tda8290.c                      |    3 +-
 drivers/media/video/tda9840.c                      |    2 +-
 drivers/media/video/tda9887.c                      |   42 +-
 drivers/media/video/tea5761.c                      |    7 +-
 drivers/media/video/tea5767.c                      |   34 +-
 drivers/media/video/tea6415c.c                     |    2 +-
 drivers/media/video/tea6420.c                      |    2 +-
 drivers/media/video/tuner-core.c                   |   44 +-
 drivers/media/video/tuner-i2c.h                    |  118 ++-
 drivers/media/video/tuner-simple.c                 |  800 +++++++---
 drivers/media/video/tuner-simple.h                 |   11 +-
 drivers/media/video/tuner-types.c                  |  184 ++-
 drivers/media/video/tuner-xc2028.c                 |   18 +-
 drivers/media/video/tvaudio.c                      |    8 +-
 drivers/media/video/tveeprom.c                     |  103 --
 drivers/media/video/tvp5150.c                      |    6 +-
 drivers/media/video/usbvideo/ibmcam.c              |    2 +-
 drivers/media/video/usbvideo/konicawc.c            |    2 +-
 drivers/media/video/usbvideo/quickcam_messenger.c  |    2 +-
 drivers/media/video/usbvideo/ultracam.c            |    4 +-
 drivers/media/video/usbvideo/usbvideo.c            |   11 +-
 drivers/media/video/usbvision/usbvision-core.c     |   14 +-
 drivers/media/video/usbvision/usbvision-i2c.c      |    2 +-
 drivers/media/video/usbvision/usbvision-video.c    |    4 +-
 drivers/media/video/v4l1-compat.c                  | 1711 +++++++++++---------
 drivers/media/video/videobuf-core.c                |    2 +
 drivers/media/video/videobuf-dma-sg.c              |  121 +-
 drivers/media/video/videobuf-dvb.c                 |    2 +-
 drivers/media/video/videobuf-vmalloc.c             |    4 +-
 drivers/media/video/videocodec.c                   |    4 +-
 drivers/media/video/vino.c                         |   10 +-
 drivers/media/video/vpx3220.c                      |    2 +-
 drivers/media/video/w9966.c                        |    4 +-
 drivers/media/video/w9968cf.c                      |    2 +-
 drivers/media/video/zc0301/zc0301_core.c           |    2 +-
 drivers/media/video/zoran_card.c                   |    6 +-
 drivers/media/video/zoran_device.c                 |    5 +-
 drivers/media/video/zoran_driver.c                 |    2 +-
 drivers/media/video/zr36016.c                      |    5 +-
 drivers/media/video/zr36050.c                      |    5 +-
 drivers/media/video/zr36060.c                      |    6 +-
 drivers/media/video/zr364xx.c                      |    4 +-
 include/asm-arm/arch-pxa/camera.h                  |   48 +
 include/asm-arm/arch-pxa/pxa-regs.h                |  147 ++-
 include/linux/dvb/dmx.h                            |    3 +-
 include/linux/meye.h                               |    2 +-
 include/linux/videodev2.h                          |   52 +-
 include/media/soc_camera.h                         |  173 ++
 include/media/tuner-types.h                        |   17 +-
 include/media/v4l2-chip-ident.h                    |    6 +
 include/media/videobuf-dma-sg.h                    |   14 +-
 201 files changed, 8734 insertions(+), 2224 deletions(-)
 create mode 100644 drivers/media/dvb/frontends/isl6405.c
 create mode 100644 drivers/media/dvb/frontends/isl6405.h
 create mode 100644 drivers/media/video/mt9m001.c
 create mode 100644 drivers/media/video/mt9v022.c
 create mode 100644 drivers/media/video/pxa_camera.c
 create mode 100644 drivers/media/video/soc_camera.c
 create mode 100644 include/asm-arm/arch-pxa/camera.h
 create mode 100644 include/media/soc_camera.h
##
# quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/		i2c
##
2.6.25-rc5-git2 to baadac8b10c5ac15ce3d26b68fa266c8889b163f
Using base baadac8b10c5ac15ce3d26b68fa266c8889b163f
i2c-amd756-fix-off-by-one.patch
i2c-fix-i2c_device_probe.patch
i2c-chips-directory-is-deprecated.patch
i2c-no-algos-in-kconfig.patch
i2c-pca-01-removing-trailing-whitespace.patch
i2c-pca-02-extension-of-pca-algorithm.patch
i2c-ibm_iic-01-change-log-levels.patch
i2c-ibm_iic-02-of-platform.patch
i2c-dev-split-i2cdev_ioctl.patch
i2c-bus-driver-for-sh7760-soc.patch
i2c-replace-remaining-__FUNCTION__-occurrences.patch
i2c-isp1301_omap-convert-to-new-style-1.patch
##
# merge i2c
##
Removed drivers/i2c/algos/i2c-algo-pca.h
Auto-merged drivers/i2c/i2c-core.c
Merge made by recursive.
 drivers/i2c/algos/Kconfig        |   39 +---
 drivers/i2c/algos/i2c-algo-pca.c |  126 ++++----
 drivers/i2c/algos/i2c-algo-pca.h |   26 --
 drivers/i2c/busses/Kconfig       |   11 +-
 drivers/i2c/busses/Makefile      |    1 +
 drivers/i2c/busses/i2c-davinci.c |    6 +-
 drivers/i2c/busses/i2c-ibm_iic.c |  197 +++++++++++++-
 drivers/i2c/busses/i2c-pca-isa.c |   53 ++---
 drivers/i2c/busses/i2c-pmcmsp.c  |    4 +-
 drivers/i2c/busses/i2c-pnx.c     |   44 ++--
 drivers/i2c/busses/i2c-pxa.c     |    2 +-
 drivers/i2c/busses/i2c-s3c2410.c |    4 +-
 drivers/i2c/busses/i2c-sh7760.c  |  577 ++++++++++++++++++++++++++++++++++++++
 drivers/i2c/chips/isp1301_omap.c |   87 +++---
 drivers/i2c/i2c-core.c           |    2 +-
 drivers/i2c/i2c-dev.c            |  329 +++++++++++-----------
 include/asm-sh/i2c-sh7760.h      |   22 ++
 include/linux/i2c-algo-pca.h     |   37 ++-
 18 files changed, 1164 insertions(+), 403 deletions(-)
 delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h
 create mode 100644 drivers/i2c/busses/i2c-sh7760.c
 create mode 100644 include/asm-sh/i2c-sh7760.h
##
# git /pub/scm/linux/kernel/git/jikos/hid.git		upstream	hid-upstream
##
Auto-merged drivers/hid/usbhid/hid-quirks.c
Auto-merged include/linux/hid.h
Merge made by recursive.
 drivers/hid/usbhid/hid-core.c   |   40 ++++---
 drivers/hid/usbhid/hid-quirks.c |    5 +
 drivers/hid/usbhid/hiddev.c     |  286 ++++++++++++++++++++-------------------
 include/linux/hid.h             |    1 +
 4 files changed, 180 insertions(+), 152 deletions(-)
##
# git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git	master		hrt
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/dtor/input.git		for-linus	input
##
Auto-merged Documentation/kernel-parameters.txt
Merge made by recursive.
 Documentation/input/notifier.txt      |   52 +++++++++++++++++++++++
 Documentation/kernel-parameters.txt   |    2 +
 drivers/input/misc/cobalt_btns.c      |   14 +++---
 drivers/input/serio/i8042-snirm.h     |   75 +++++++++++++++++++++++++++++++++
 drivers/input/serio/i8042-x86ia64io.h |    7 +++
 drivers/input/serio/i8042.c           |    3 +-
 drivers/input/serio/i8042.h           |    2 +
 drivers/input/tablet/wacom.h          |    6 ++-
 drivers/input/tablet/wacom_sys.c      |    6 +++
 drivers/input/tablet/wacom_wac.c      |   31 +++++++++----
 drivers/input/tablet/wacom_wac.h      |    1 +
 drivers/input/touchscreen/ads7846.c   |    2 +-
 12 files changed, 179 insertions(+), 22 deletions(-)
 create mode 100644 Documentation/input/notifier.txt
 create mode 100644 drivers/input/serio/i8042-snirm.h
##
# git /pub/scm/linux/kernel/git/dtor/input.git		master		input-devel
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/shaggy/jfs-2.6.git	for-linus	jfs
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/sam/kbuild.git		master		kbuild
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/avi/kvm.git		master		kvm
##
Auto-merged arch/x86/Kconfig
Removed arch/x86/kvm/segment_descriptor.h
Merge made by recursive.
 arch/x86/Kconfig                  |   10 +
 arch/x86/kernel/Makefile          |    1 +
 arch/x86/kernel/kvmclock.c        |  159 ++++++++++
 arch/x86/kernel/setup_32.c        |    5 +
 arch/x86/kernel/setup_64.c        |    5 +
 arch/x86/kvm/Makefile             |    3 +-
 arch/x86/kvm/i8254.c              |  592 +++++++++++++++++++++++++++++++++++++
 arch/x86/kvm/i8254.h              |   61 ++++
 arch/x86/kvm/irq.c                |    3 +
 arch/x86/kvm/kvm_svm.h            |    2 +
 arch/x86/kvm/lapic.c              |    8 +-
 arch/x86/kvm/mmu.c                |  417 +++++++++++++++++++++-----
 arch/x86/kvm/mmu.h                |    6 +
 arch/x86/kvm/paging_tmpl.h        |   70 +++--
 arch/x86/kvm/segment_descriptor.h |   29 --
 arch/x86/kvm/svm.c                |  229 +++++++++++----
 arch/x86/kvm/vmx.c                |  132 +++++++--
 arch/x86/kvm/vmx.h                |   10 +-
 arch/x86/kvm/x86.c                |  343 +++++++++++++++++-----
 arch/x86/kvm/x86_emulate.c        |  256 +++++++++-------
 include/asm-x86/kvm.h             |   21 ++
 include/asm-x86/kvm_host.h        |   40 ++-
 include/asm-x86/kvm_para.h        |   25 ++
 include/linux/kvm.h               |    7 +
 include/linux/kvm_host.h          |   14 +-
 virt/kvm/kvm_main.c               |   91 +++++-
 26 files changed, 2110 insertions(+), 429 deletions(-)
 create mode 100644 arch/x86/kernel/kvmclock.c
 create mode 100644 arch/x86/kvm/i8254.c
 create mode 100644 arch/x86/kvm/i8254.h
 delete mode 100644 arch/x86/kvm/segment_descriptor.h
##
# git git://git.o-hand.com/linux-rpurdie-leds		for-linus	leds
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/axboe/linux-2.6-block	for-linus	block-for-linus
##
Removed drivers/block/ps2esdi.c
Auto-merged include/linux/Kbuild
Removed include/linux/ps2esdi.h
Merge made by recursive.
 Documentation/mca.txt   |   17 +-
 block/Kconfig           |   65 ++-
 block/Kconfig.iosched   |   74 +++-
 drivers/block/Kconfig   |   10 -
 drivers/block/Makefile  |    1 -
 drivers/block/ps2esdi.c | 1079 -----------------------------------------------
 include/linux/Kbuild    |    1 -
 include/linux/ps2esdi.h |   98 -----
 8 files changed, 105 insertions(+), 1240 deletions(-)
 delete mode 100644 drivers/block/ps2esdi.c
 delete mode 100644 include/linux/ps2esdi.h
##
# git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes	libata-upstream-fixes
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream	libata-upstream
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/roland/infiniband.git	for-linus	infiniband-for-linus
##
Already up-to-date.
##
# gitfetch /pub/scm/linux/kernel/git/roland/infiniband.git	for-2.6.26	infiniband
##
##
# revert a1dcf69bd2f16de76f530c80c11d1356b13f5423 infiniband
##
Created commit 5c3605b: Revert "IB: Replace remaining __FUNCTION__ occurrences with __func__"
 26 files changed, 302 insertions(+), 302 deletions(-)
##
# merge infiniband resolve /home/jejb/infiniband-fixup.diff
##
Auto-merged drivers/infiniband/core/uverbs.h
Auto-merged drivers/infiniband/core/uverbs_main.c
Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h
Auto-merged drivers/infiniband/hw/mthca/mthca_provider.c
Auto-merged drivers/infiniband/hw/nes/nes_verbs.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c
Auto-merged include/rdma/ib_verbs.h
Created commit 83f4c82: Resolve Patch: /home/jejb/infiniband-fixup.diff
##
# git /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git	release		acpi
##
Already up-to-date.
##
# git /home/rmk/linux-2.6-arm.git	for-linus	arm-for-linus
##
Already up-to-date.
##
# git /home/rmk/linux-2.6-arm.git	master		arm
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus	ieee1394-for-linus
##
Merge made by recursive.
 drivers/firewire/Kconfig          |   50 +++++++-----------
 drivers/firewire/fw-ohci.c        |  108 +++++++++++++++++++++++++++---------
 drivers/firewire/fw-sbp2.c        |   36 +++++++++++--
 drivers/firewire/fw-topology.c    |    3 +-
 drivers/firewire/fw-transaction.c |    2 +-
 drivers/firewire/fw-transaction.h |    6 +-
 drivers/ieee1394/sbp2.c           |    5 ++
 7 files changed, 143 insertions(+), 67 deletions(-)
##
# git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git master		ieee1394
##
Merge made by recursive.
 Documentation/debugging-via-ohci1394.txt |   13 +-
 drivers/firewire/fw-card.c               |   40 +-----
 drivers/firewire/fw-cdev.c               |   13 +-
 drivers/firewire/fw-device.c             |  263 ++++++++++++++++++++++++------
 drivers/firewire/fw-device.h             |   38 +++-
 drivers/firewire/fw-ohci.c               |  114 +++++++-------
 drivers/firewire/fw-sbp2.c               |  150 ++++++++---------
 drivers/firewire/fw-topology.c           |    3 +
 drivers/firewire/fw-topology.h           |   11 +-
 drivers/firewire/fw-transaction.c        |   11 +-
 drivers/firewire/fw-transaction.h        |    6 -
 drivers/ieee1394/csr.c                   |    6 +-
 drivers/ieee1394/dv1394.c                |    3 +-
 drivers/ieee1394/highlevel.c             |    6 +-
 drivers/ieee1394/ieee1394_core.c         |    2 +-
 drivers/ieee1394/nodemgr.c               |    6 +-
 drivers/ieee1394/ohci1394.c              |  111 ++++++-------
 drivers/ieee1394/pcilynx.c               |   12 +-
 drivers/ieee1394/raw1394.c               |    1 -
 drivers/ieee1394/sbp2.c                  |   11 +-
 drivers/ieee1394/video1394.c             |    3 +-
 lib/Kconfig.debug                        |   10 +
 22 files changed, 487 insertions(+), 346 deletions(-)
##
# git git://lost.foo-projects.org/~dwillia2/git/iop	md-fixes-for-linus	iop-fixes
##
Already up-to-date.
##
# git git://lost.foo-projects.org/~dwillia2/git/iop	md-for-linus	iop
##
Auto-merged crypto/async_tx/async_tx.c
Auto-merged drivers/dma/dmaengine.c
Auto-merged drivers/dma/fsldma.c
Auto-merged drivers/dma/iop-adma.c
Merge made by recursive.
 crypto/async_tx/async_tx.c             |  197 ++++++++++++++++++++++++++------
 drivers/dma/dmaengine.c                |    3 -
 drivers/dma/fsldma.c                   |    8 --
 drivers/dma/ioat_dma.c                 |   12 --
 drivers/dma/iop-adma.c                 |   21 +---
 include/asm-arm/arch-iop13xx/adma.h    |    5 -
 include/asm-arm/hardware/iop3xx-adma.h |    8 --
 include/asm-arm/hardware/iop_adma.h    |    2 -
 include/linux/dmaengine.h              |   11 +--
 9 files changed, 170 insertions(+), 97 deletions(-)
##
# git git://www.linux-mips.org/pub/scm/upstream-linus.git	upstream	mips
##
Already up-to-date.
##
# git git://www.linux-mips.org/pub/scm/upstream.git	master		mips-devel
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/drzeus/mmc.git		for-linus	mmc
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/drzeus/mmc.git		for-andrew	mmc-devel
##
Already up-to-date.
##
# git git://git.infradead.org/mtd-2.6.git			master		mtd
##
Merge made by recursive.
 drivers/mtd/onenand/onenand_base.c |   32 +++++++++++++++++---------------
 fs/jffs2/fs.c                      |   14 +++++++++++---
 2 files changed, 28 insertions(+), 18 deletions(-)
##
# git /pub/scm/linux/kernel/git/davem/net-2.6.26.git	master		net
##
Auto-merged drivers/net/wireless/libertas/cmdresp.c
Removed drivers/net/wireless/rt2x00/rt2x00ring.h
Auto-merged drivers/net/wireless/rt2x00/rt61pci.c
Auto-merged drivers/net/wireless/rt2x00/rt73usb.c
Auto-merged net/ipv4/tcp_output.c
Removed net/mac80211/regdomain.c
Auto-merged net/sctp/ipv6.c
Auto-merged net/sctp/protocol.c
Auto-merged net/sctp/socket.c
Merge made by recursive.
 Documentation/DocBook/Makefile                     |    3 +-
 Documentation/DocBook/mac80211.tmpl                |  335 +++++
 drivers/net/bonding/bond_main.c                    |    8 +-
 drivers/net/cxgb3/l2t.c                            |    2 +-
 drivers/net/niu.c                                  |  701 ++++++++-
 drivers/net/niu.h                                  |    4 +-
 drivers/net/via-velocity.c                         |   23 +-
 drivers/net/wan/cosa.c                             |   14 +-
 drivers/net/wireless/Kconfig                       |   44 +-
 drivers/net/wireless/adm8211.c                     |   88 +-
 drivers/net/wireless/adm8211.h                     |   65 +-
 drivers/net/wireless/ath5k/Kconfig                 |   37 +
 drivers/net/wireless/ath5k/Makefile                |    8 +-
 drivers/net/wireless/ath5k/ath5k.h                 |  159 +-
 drivers/net/wireless/ath5k/base.c                  |  558 +++++---
 drivers/net/wireless/ath5k/base.h                  |   18 +-
 drivers/net/wireless/ath5k/debug.c                 |   92 +-
 drivers/net/wireless/ath5k/debug.h                 |   29 +-
 drivers/net/wireless/ath5k/hw.c                    |  613 ++++----
 drivers/net/wireless/ath5k/hw.h                    |  150 ++-
 drivers/net/wireless/ath5k/initvals.c              |  239 +++-
 drivers/net/wireless/ath5k/phy.c                   |  262 +++-
 drivers/net/wireless/ath5k/reg.h                   |    4 +-
 drivers/net/wireless/atmel.c                       |    5 +-
 drivers/net/wireless/b43/b43.h                     |  132 ++-
 drivers/net/wireless/b43/dma.c                     |  386 +++---
 drivers/net/wireless/b43/dma.h                     |   11 +-
 drivers/net/wireless/b43/main.c                    |  624 ++++++---
 drivers/net/wireless/b43/main.h                    |    8 +-
 drivers/net/wireless/b43/sysfs.c                   |   89 +--
 drivers/net/wireless/b43/xmit.c                    |  122 +-
 drivers/net/wireless/b43/xmit.h                    |   12 -
 drivers/net/wireless/b43legacy/b43legacy.h         |   46 +-
 drivers/net/wireless/b43legacy/main.c              |  433 +++---
 drivers/net/wireless/b43legacy/xmit.c              |   78 +-
 drivers/net/wireless/ipw2200.c                     |    4 +-
 drivers/net/wireless/iwlwifi/Kconfig               |   22 +-
 drivers/net/wireless/iwlwifi/Makefile              |    3 +
 drivers/net/wireless/iwlwifi/iwl-3945-commands.h   |   59 +-
 drivers/net/wireless/iwlwifi/iwl-3945-core.h       |   80 +
 drivers/net/wireless/iwlwifi/iwl-3945-debug.h      |   17 +-
 drivers/net/wireless/iwlwifi/iwl-3945-hw.h         |  175 ---
 drivers/net/wireless/iwlwifi/iwl-3945-io.h         |   39 +-
 drivers/net/wireless/iwlwifi/iwl-3945-rs.c         |  148 +-
 drivers/net/wireless/iwlwifi/iwl-3945-rs.h         |    6 +-
 drivers/net/wireless/iwlwifi/iwl-3945.c            |  413 +++++-
 drivers/net/wireless/iwlwifi/iwl-3945.h            |   57 +-
 drivers/net/wireless/iwlwifi/iwl-4965-commands.h   |   77 +-
 drivers/net/wireless/iwlwifi/iwl-4965-debug.h      |   16 +
 drivers/net/wireless/iwlwifi/iwl-4965-hw.h         |  176 ---
 drivers/net/wireless/iwlwifi/iwl-4965-io.h         |   39 +-
 drivers/net/wireless/iwlwifi/iwl-4965-rs.c         |  461 +++++--
 drivers/net/wireless/iwlwifi/iwl-4965-rs.h         |   14 +-
 drivers/net/wireless/iwlwifi/iwl-4965.c            | 1161 +++++++--------
 drivers/net/wireless/iwlwifi/iwl-4965.h            |  152 +--
 drivers/net/wireless/iwlwifi/iwl-core.c            |   47 +
 drivers/net/wireless/iwlwifi/iwl-core.h            |   84 ++
 drivers/net/wireless/iwlwifi/iwl-csr.h             |  259 ++++
 drivers/net/wireless/iwlwifi/iwl-eeprom.c          |  205 +++
 drivers/net/wireless/iwlwifi/iwl-eeprom.h          |  399 +++++
 drivers/net/wireless/iwlwifi/iwl-helpers.h         |   20 +
 drivers/net/wireless/iwlwifi/iwl3945-base.c        |  966 +++----------
 drivers/net/wireless/iwlwifi/iwl4965-base.c        |  994 ++++----------
 drivers/net/wireless/libertas/assoc.c              |   32 +-
 drivers/net/wireless/libertas/assoc.h              |    1 -
 drivers/net/wireless/libertas/cmd.c                |  154 ++-
 drivers/net/wireless/libertas/cmd.h                |    2 +
 drivers/net/wireless/libertas/cmdresp.c            |   69 +-
 drivers/net/wireless/libertas/debugfs.c            |    2 +-
 drivers/net/wireless/libertas/dev.h                |    4 +-
 drivers/net/wireless/libertas/hostcmd.h            |   19 +-
 drivers/net/wireless/libertas/join.c               |   20 -
 drivers/net/wireless/libertas/join.h               |    2 -
 drivers/net/wireless/libertas/main.c               |   14 +-
 drivers/net/wireless/libertas/scan.c               |  576 ++++-----
 drivers/net/wireless/libertas/scan.h               |   54 +-
 drivers/net/wireless/libertas/types.h              |   13 +
 drivers/net/wireless/p54.h                         |    4 -
 drivers/net/wireless/p54common.c                   |   96 +-
 drivers/net/wireless/p54common.h                   |   75 -
 drivers/net/wireless/prism54/isl_ioctl.c           |   46 +-
 drivers/net/wireless/prism54/islpci_dev.c          |    2 +-
 drivers/net/wireless/prism54/islpci_dev.h          |    6 +-
 drivers/net/wireless/rt2x00/Kconfig                |   62 +-
 drivers/net/wireless/rt2x00/Makefile               |   37 +-
 drivers/net/wireless/rt2x00/rt2400pci.c            |  436 ++++---
 drivers/net/wireless/rt2x00/rt2400pci.h            |    8 +-
 drivers/net/wireless/rt2x00/rt2500pci.c            |  442 ++++---
 drivers/net/wireless/rt2x00/rt2500pci.h            |    6 +-
 drivers/net/wireless/rt2x00/rt2500usb.c            |  512 ++++---
 drivers/net/wireless/rt2x00/rt2500usb.h            |    9 +-
 drivers/net/wireless/rt2x00/rt2x00.h               |  339 +++--
 drivers/net/wireless/rt2x00/rt2x00config.c         |  163 ++-
 drivers/net/wireless/rt2x00/rt2x00debug.c          |  124 ++-
 drivers/net/wireless/rt2x00/rt2x00debug.h          |    2 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c            |  907 +++++-------
 drivers/net/wireless/rt2x00/rt2x00dump.h           |    8 +-
 drivers/net/wireless/rt2x00/rt2x00firmware.c       |   43 +-
 drivers/net/wireless/rt2x00/rt2x00leds.c           |  217 +++
 drivers/net/wireless/rt2x00/rt2x00leds.h           |   63 +
 drivers/net/wireless/rt2x00/rt2x00lib.h            |  101 ++-
 drivers/net/wireless/rt2x00/rt2x00mac.c            |  243 ++--
 drivers/net/wireless/rt2x00/rt2x00pci.c            |  286 ++--
 drivers/net/wireless/rt2x00/rt2x00pci.h            |   67 +-
 drivers/net/wireless/rt2x00/rt2x00queue.c          |  299 ++++
 drivers/net/wireless/rt2x00/rt2x00queue.h          |  457 ++++++
 drivers/net/wireless/rt2x00/rt2x00reg.h            |   75 +-
 drivers/net/wireless/rt2x00/rt2x00rfkill.c         |    2 +-
 drivers/net/wireless/rt2x00/rt2x00ring.h           |  290 ----
 drivers/net/wireless/rt2x00/rt2x00usb.c            |  324 +++--
 drivers/net/wireless/rt2x00/rt2x00usb.h            |  161 ++-
 drivers/net/wireless/rt2x00/rt61pci.c              |  640 +++++----
 drivers/net/wireless/rt2x00/rt61pci.h              |   33 +-
 drivers/net/wireless/rt2x00/rt73usb.c              |  521 ++++---
 drivers/net/wireless/rt2x00/rt73usb.h              |   24 +-
 drivers/net/wireless/rtl8180.h                     |    2 +-
 drivers/net/wireless/rtl8180_dev.c                 |  103 +-
 drivers/net/wireless/rtl8180_grf5101.c             |    5 +-
 drivers/net/wireless/rtl8180_max2820.c             |    5 +-
 drivers/net/wireless/rtl8180_rtl8225.c             |   15 +-
 drivers/net/wireless/rtl8180_sa2400.c              |    5 +-
 drivers/net/wireless/rtl8187.h                     |    2 +-
 drivers/net/wireless/rtl8187_dev.c                 |   92 +-
 drivers/net/wireless/rtl8187_rtl8225.c             |   15 +-
 drivers/net/wireless/rtl818x.h                     |   70 -
 drivers/net/wireless/strip.c                       |    6 +-
 drivers/net/wireless/zd1211rw/zd_chip.c            |   24 +-
 drivers/net/wireless/zd1211rw/zd_chip.h            |   17 +-
 drivers/net/wireless/zd1211rw/zd_ieee80211.c       |   11 +-
 drivers/net/wireless/zd1211rw/zd_mac.c             |  241 ++--
 drivers/net/wireless/zd1211rw/zd_mac.h             |    5 +-
 drivers/net/wireless/zd1211rw/zd_usb.c             |   11 +-
 drivers/s390/net/qeth_main.c                       |    3 +
 drivers/ssb/Kconfig                                |    9 +
 drivers/ssb/Makefile                               |    1 +
 drivers/ssb/driver_chipcommon.c                    |   10 +
 drivers/ssb/driver_gige.c                          |  294 ++++
 drivers/ssb/driver_mipscore.c                      |    1 +
 drivers/ssb/driver_pcicore.c                       |  160 ++-
 drivers/ssb/embedded.c                             |   90 ++
 drivers/ssb/main.c                                 |   48 +-
 drivers/ssb/pci.c                                  |   28 +
 drivers/ssb/pcmcia.c                               |   32 +
 drivers/ssb/ssb_private.h                          |    2 +
 include/linux/icmpv6.h                             |   11 +-
 include/linux/ieee80211.h                          |   35 +
 include/linux/if_arp.h                             |    6 +
 include/linux/inetdevice.h                         |    2 +-
 include/linux/nl80211.h                            |  218 +++-
 include/linux/skbuff.h                             |    5 +-
 include/linux/ssb/ssb.h                            |   17 +
 include/linux/ssb/ssb_driver_chipcommon.h          |    4 +
 include/linux/ssb/ssb_driver_gige.h                |  174 +++
 include/linux/ssb/ssb_driver_pci.h                 |   19 +
 include/linux/udp.h                                |    1 +
 include/linux/wireless.h                           |    1 +
 include/linux/xfrm.h                               |    3 +-
 include/net/addrconf.h                             |   28 +-
 include/net/cfg80211.h                             |  159 ++-
 include/net/icmp.h                                 |    2 +-
 include/net/inet_sock.h                            |    2 +-
 include/net/ip6_fib.h                              |   18 +-
 include/net/ip6_route.h                            |   30 +-
 include/net/ipv6.h                                 |   15 +-
 include/net/llc_if.h                               |    5 -
 include/net/mac80211.h                             |  482 ++++---
 include/net/ndisc.h                                |    4 +-
 include/net/neighbour.h                            |    6 -
 include/net/netns/ipv4.h                           |    2 +
 include/net/netns/ipv6.h                           |   18 +
 include/net/request_sock.h                         |    3 +-
 include/net/sctp/sctp.h                            |    5 -
 include/net/sctp/structs.h                         |    8 +
 include/net/sock.h                                 |   13 +
 include/net/tcp.h                                  |   10 +-
 include/net/tipc/tipc_bearer.h                     |    9 +
 include/net/tipc/tipc_port.h                       |    7 -
 include/net/wireless.h                             |  168 +++
 include/net/xfrm.h                                 |   52 +-
 net/8021q/vlan_dev.c                               |   12 +-
 net/8021q/vlanproc.c                               |    2 +-
 net/9p/error.c                                     |    2 +-
 net/Kconfig                                        |    2 +-
 net/appletalk/aarp.c                               |   21 +-
 net/atm/clip.c                                     |    4 -
 net/atm/lec.c                                      |   29 +-
 net/atm/proc.c                                     |   32 +-
 net/bridge/br_netfilter.c                          |   14 +-
 net/bridge/br_sysfs_br.c                           |    6 +-
 net/core/dev_mcast.c                               |   37 +-
 net/core/dst.c                                     |    3 -
 net/core/neighbour.c                               |    7 +-
 net/core/netpoll.c                                 |    6 +-
 net/core/sock.c                                    |   21 +-
 net/dccp/dccp.h                                    |    6 +-
 net/dccp/ipv4.c                                    |   18 +-
 net/dccp/ipv6.c                                    |   38 +-
 net/dccp/minisocks.c                               |    2 +-
 net/decnet/af_decnet.c                             |   21 +-
 net/ieee80211/softmac/ieee80211softmac_priv.h      |    2 +-
 net/ipv4/af_inet.c                                 |   14 +-
 net/ipv4/arp.c                                     |   13 +-
 net/ipv4/devinet.c                                 |   21 +-
 net/ipv4/icmp.c                                    |  111 +-
 net/ipv4/igmp.c                                    |   41 +-
 net/ipv4/inet_connection_sock.c                    |    2 +-
 net/ipv4/ip_forward.c                              |    2 +-
 net/ipv4/ip_gre.c                                  |    4 +-
 net/ipv4/ip_input.c                                |    2 +-
 net/ipv4/ip_options.c                              |   19 +-
 net/ipv4/ip_output.c                               |   10 +-
 net/ipv4/ip_sockglue.c                             |    2 +-
 net/ipv4/ipconfig.c                                |    7 +-
 net/ipv4/ipip.c                                    |    2 +-
 net/ipv4/ipmr.c                                    |    6 +-
 net/ipv4/ipvs/ip_vs_proto_tcp.c                    |    2 +-
 net/ipv4/ipvs/ip_vs_proto_udp.c                    |    2 +-
 net/ipv4/ipvs/ip_vs_sync.c                         |    4 +-
 net/ipv4/netfilter/arp_tables.c                    |    7 +-
 net/ipv4/netfilter/ip_tables.c                     |    2 +-
 net/ipv4/netfilter/ipt_MASQUERADE.c                |   16 +-
 .../netfilter/nf_conntrack_l3proto_ipv4_compat.c   |    2 +-
 net/ipv4/netfilter/nf_nat_helper.c                 |    4 +-
 net/ipv4/route.c                                   |   97 +-
 net/ipv4/syncookies.c                              |   11 +-
 net/ipv4/tcp_cubic.c                               |   35 +-
 net/ipv4/tcp_input.c                               |    3 +-
 net/ipv4/tcp_ipv4.c                                |   35 +-
 net/ipv4/tcp_minisocks.c                           |    4 +-
 net/ipv4/tcp_output.c                              |    1 +
 net/ipv4/udplite.c                                 |    4 +-
 net/ipv6/Makefile                                  |    1 +
 net/ipv6/addrconf.c                                |  198 ++--
 net/ipv6/addrlabel.c                               |   19 +-
 net/ipv6/af_inet6.c                                |  175 ++-
 net/ipv6/anycast.c                                 |    2 +-
 net/ipv6/fib6_rules.c                              |  103 +-
 net/ipv6/icmp.c                                    |  133 ++-
 net/ipv6/ip6_fib.c                                 |  292 +++--
 net/ipv6/ip6_input.c                               |    5 -
 net/ipv6/ip6_output.c                              |   14 +-
 net/ipv6/ip6_tunnel.c                              |    8 +-
 net/ipv6/ipv6_sockglue.c                           |  125 +--
 net/ipv6/mcast.c                                   |  178 ++-
 net/ipv6/mip6.c                                    |   20 +-
 net/ipv6/ndisc.c                                   |  139 +-
 net/ipv6/netfilter.c                               |    4 +-
 net/ipv6/netfilter/ip6_tables.c                    |    2 +-
 net/ipv6/netfilter/ip6t_REJECT.c                   |    4 +-
 net/ipv6/proc.c                                    |    3 +
 net/ipv6/route.c                                   |  555 +++++---
 net/ipv6/sit.c                                     |    6 +-
 net/ipv6/syncookies.c                              |  267 ++++
 net/ipv6/sysctl_net_ipv6.c                         |   15 +-
 net/ipv6/tcp_ipv6.c                                |  171 ++-
 net/ipv6/udp.c                                     |    3 +
 net/ipv6/xfrm6_policy.c                            |    7 +-
 net/irda/af_irda.c                                 |  178 ++--
 net/irda/discovery.c                               |    4 +-
 net/irda/ircomm/ircomm_core.c                      |   46 +-
 net/irda/ircomm/ircomm_event.c                     |   12 +-
 net/irda/ircomm/ircomm_lmp.c                       |   30 +-
 net/irda/ircomm/ircomm_param.c                     |   32 +-
 net/irda/ircomm/ircomm_ttp.c                       |   26 +-
 net/irda/ircomm/ircomm_tty.c                       |   90 +-
 net/irda/ircomm/ircomm_tty_attach.c                |   78 +-
 net/irda/ircomm/ircomm_tty_ioctl.c                 |   18 +-
 net/irda/irda_device.c                             |   18 +-
 net/irda/iriap.c                                   |   76 +-
 net/irda/iriap_event.c                             |   38 +-
 net/irda/irias_object.c                            |   44 +-
 net/irda/irlan/irlan_client.c                      |   48 +-
 net/irda/irlan/irlan_client_event.c                |   64 +-
 net/irda/irlan/irlan_common.c                      |   72 +-
 net/irda/irlan/irlan_eth.c                         |   18 +-
 net/irda/irlan/irlan_event.c                       |    4 +-
 net/irda/irlan/irlan_filter.c                      |    4 +-
 net/irda/irlan/irlan_provider.c                    |   30 +-
 net/irda/irlan/irlan_provider_event.c              |   16 +-
 net/irda/irlap.c                                   |   56 +-
 net/irda/irlap_event.c                             |  122 +-
 net/irda/irlap_frame.c                             |   74 +-
 net/irda/irlmp.c                                   |  112 +-
 net/irda/irlmp_event.c                             |   94 +-
 net/irda/irlmp_frame.c                             |   36 +-
 net/irda/irmod.c                                   |    2 +-
 net/irda/irnet/irnet.h                             |   10 +-
 net/irda/irnetlink.c                               |    4 +-
 net/irda/irqueue.c                                 |    8 +-
 net/irda/irttp.c                                   |  108 +-
 net/irda/parameters.c                              |   42 +-
 net/irda/qos.c                                     |   24 +-
 net/irda/wrapper.c                                 |   18 +-
 net/key/af_key.c                                   |  120 ++-
 net/llc/af_llc.c                                   |   16 +-
 net/llc/llc_c_ac.c                                 |    2 +-
 net/llc/llc_c_ev.c                                 |    8 +-
 net/llc/llc_conn.c                                 |   24 +-
 net/llc/llc_input.c                                |    4 +-
 net/mac80211/Kconfig                               |   16 +
 net/mac80211/Makefile                              |    7 +-
 net/mac80211/cfg.c                                 |  400 +++++-
 net/mac80211/debugfs.c                             |   47 +-
 net/mac80211/debugfs_netdev.c                      |  206 +++-
 net/mac80211/debugfs_sta.c                         |  174 ++-
 net/mac80211/debugfs_sta.h                         |    2 +
 net/mac80211/ieee80211.c                           |  950 +++++++++----
 net/mac80211/ieee80211_i.h                         |  468 ++++--
 net/mac80211/ieee80211_iface.c                     |   48 +-
 net/mac80211/ieee80211_ioctl.c                     |  234 ++--
 net/mac80211/ieee80211_key.h                       |   26 +-
 net/mac80211/ieee80211_rate.c                      |   23 +-
 net/mac80211/ieee80211_rate.h                      |   29 +-
 net/mac80211/ieee80211_sta.c                       | 1525 +++++++++++++-------
 net/mac80211/key.c                                 |  183 ++-
 net/mac80211/mesh.c                                |  449 ++++++
 net/mac80211/mesh.h                                |  290 ++++
 net/mac80211/mesh_hwmp.c                           |  857 +++++++++++
 net/mac80211/mesh_pathtbl.c                        |  516 +++++++
 net/mac80211/mesh_plink.c                          |  761 ++++++++++
 net/mac80211/rc80211_pid_algo.c                    |  122 +-
 net/mac80211/rc80211_simple.c                      |   90 +-
 net/mac80211/regdomain.c                           |  152 --
 net/mac80211/rx.c                                  |  857 +++++++-----
 net/mac80211/sta_info.c                            |  550 +++++---
 net/mac80211/sta_info.h                            |  322 +++--
 net/mac80211/tx.c                                  |  727 ++++++----
 net/mac80211/util.c                                |  170 +--
 net/mac80211/wep.c                                 |   40 +-
 net/mac80211/wep.h                                 |    8 +-
 net/mac80211/wme.c                                 |  139 ++-
 net/mac80211/wme.h                                 |   23 +-
 net/mac80211/wpa.c                                 |  152 +-
 net/mac80211/wpa.h                                 |   24 +-
 net/netfilter/nf_conntrack_netbios_ns.c            |    2 +-
 net/netfilter/nf_conntrack_standalone.c            |    2 +-
 net/netlink/af_netlink.c                           |   26 +-
 net/rxrpc/ar-internal.h                            |    8 +-
 net/rxrpc/ar-proc.c                                |    4 +-
 net/sched/em_meta.c                                |    4 +-
 net/sctp/associola.c                               |    8 +-
 net/sctp/chunk.c                                   |    2 +-
 net/sctp/input.c                                   |    2 +-
 net/sctp/ipv6.c                                    |   13 +-
 net/sctp/output.c                                  |   14 +-
 net/sctp/outqueue.c                                |   17 +-
 net/sctp/proc.c                                    |   20 +-
 net/sctp/protocol.c                                |   15 +-
 net/sctp/sm_sideeffect.c                           |    6 +-
 net/sctp/sm_statefuns.c                            |   12 +-
 net/sctp/socket.c                                  |   14 +-
 net/sctp/transport.c                               |   10 +-
 net/sunrpc/auth_gss/auth_gss.c                     |    2 +-
 net/sunrpc/clnt.c                                  |   44 +-
 net/sunrpc/rpc_pipe.c                              |   12 +-
 net/sunrpc/rpcb_clnt.c                             |   20 +-
 net/sunrpc/xprtsock.c                              |    2 +-
 net/tipc/core.c                                    |   11 +-
 net/tipc/core.h                                    |    6 +
 net/tipc/link.c                                    |   16 +-
 net/tipc/msg.c                                     |   16 +-
 net/tipc/msg.h                                     |   50 +-
 net/tipc/port.c                                    |   12 +-
 net/tipc/socket.c                                  |   61 +-
 net/unix/af_unix.c                                 |    2 +-
 net/wireless/Makefile                              |    2 +-
 net/wireless/core.c                                |   41 +
 net/wireless/core.h                                |    3 +
 net/wireless/nl80211.c                             |  552 +++++++-
 net/wireless/reg.c                                 |  159 ++
 net/wireless/util.c                                |   98 ++
 net/xfrm/xfrm_policy.c                             |   79 +-
 net/xfrm/xfrm_state.c                              |   53 +-
 net/xfrm/xfrm_user.c                               |   71 +-
 374 files changed, 25392 insertions(+), 14171 deletions(-)
 create mode 100644 Documentation/DocBook/mac80211.tmpl
 create mode 100644 drivers/net/wireless/ath5k/Kconfig
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-core.h
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-core.c
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-core.h
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-csr.h
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-eeprom.c
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-eeprom.h
 create mode 100644 drivers/net/wireless/rt2x00/rt2x00leds.c
 create mode 100644 drivers/net/wireless/rt2x00/rt2x00leds.h
 create mode 100644 drivers/net/wireless/rt2x00/rt2x00queue.c
 create mode 100644 drivers/net/wireless/rt2x00/rt2x00queue.h
 delete mode 100644 drivers/net/wireless/rt2x00/rt2x00ring.h
 create mode 100644 drivers/ssb/driver_gige.c
 create mode 100644 include/linux/ssb/ssb_driver_gige.h
 create mode 100644 net/ipv6/syncookies.c
 create mode 100644 net/mac80211/mesh.c
 create mode 100644 net/mac80211/mesh.h
 create mode 100644 net/mac80211/mesh_hwmp.c
 create mode 100644 net/mac80211/mesh_pathtbl.c
 create mode 100644 net/mac80211/mesh_plink.c
 delete mode 100644 net/mac80211/regdomain.c
 create mode 100644 net/wireless/reg.c
 create mode 100644 net/wireless/util.c
##
# git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git	linux-next	nfs
##
Auto-merged net/sunrpc/auth_gss/auth_gss.c
Auto-merged net/sunrpc/clnt.c
Auto-merged net/sunrpc/rpcb_clnt.c
Auto-merged net/sunrpc/xprtsock.c
Merge made by recursive.
 fs/nfs/client.c                |    2 +
 fs/nfs/direct.c                |    9 +-
 fs/nfs/inode.c                 |   43 +++++++-
 fs/nfs/internal.h              |    1 +
 fs/nfs/nfs4proc.c              |   10 ++-
 fs/nfs/nfs4state.c             |    8 +-
 fs/nfs/read.c                  |   16 +--
 fs/nfs/write.c                 |   63 +++++-----
 include/linux/sunrpc/clnt.h    |    9 +-
 include/linux/sunrpc/sched.h   |   41 +++----
 net/sunrpc/auth_gss/auth_gss.c |    5 +-
 net/sunrpc/clnt.c              |    8 +-
 net/sunrpc/rpcb_clnt.c         |    2 +-
 net/sunrpc/sched.c             |  255 ++++++++++++++++++----------------------
 net/sunrpc/xprt.c              |   45 ++++---
 net/sunrpc/xprtsock.c          |    7 +-
 16 files changed, 281 insertions(+), 243 deletions(-)
##
# git git://git.linux-nfs.org/~bfields/linux.git		for-linus	nfsd-for-linus
##
Already up-to-date.
##
# git git://git.linux-nfs.org/~bfields/linux.git		for-2.6.26	nfsd
##
Auto-merged fs/nfsd/export.c
Auto-merged fs/nfsd/nfsctl.c
Auto-merged include/net/ipv6.h
Auto-merged net/sunrpc/auth_gss/auth_gss.c
Auto-merged net/sunrpc/svcauth_unix.c
Merge made by recursive.
 fs/nfs/symlink.c               |    1 -
 fs/nfsd/export.c               |    9 ++-
 fs/nfsd/nfsctl.c               |   15 +++++-
 include/linux/nfs3.h           |    2 +-
 include/linux/sunrpc/svcauth.h |    4 +-
 include/net/ipv6.h             |    9 +++
 net/sunrpc/auth_gss/auth_gss.c |   39 ++++++++-----
 net/sunrpc/svcauth_unix.c      |  118 +++++++++++++++++++++++++++-------------
 8 files changed, 135 insertions(+), 62 deletions(-)
##
# git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git	for-linus	s390-linus
##
Merge made by recursive.
 arch/s390/kernel/compat_signal.c |   10 ++++++++++
 arch/s390/kernel/signal.c        |   10 ++++++++++
 drivers/s390/block/Kconfig       |    1 +
 drivers/s390/block/dasd.c        |    1 +
 4 files changed, 22 insertions(+), 0 deletions(-)
##
# git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git	features	s390
##
Merge made by recursive.
 arch/s390/Kconfig                   |    4 +
 arch/s390/defconfig                 |    4 +-
 arch/s390/kernel/Makefile           |    2 +-
 arch/s390/kernel/early.c            |   14 ++
 arch/s390/kernel/head64.S           |   12 ++-
 arch/s390/kernel/setup.c            |   32 ++--
 arch/s390/kernel/smp.c              |   87 +++++++++-
 arch/s390/kernel/topology.c         |  315 +++++++++++++++++++++++++++++++++++
 arch/s390/mm/Makefile               |    2 +-
 arch/s390/mm/fault.c                |    3 +
 arch/s390/mm/hugetlbpage.c          |  134 +++++++++++++++
 arch/s390/mm/init.c                 |   23 ---
 arch/s390/mm/vmem.c                 |   55 ++++++-
 drivers/base/topology.c             |   17 +-
 drivers/char/hw_random/core.c       |    4 +
 drivers/crypto/Kconfig              |    1 +
 drivers/s390/block/dasd_3990_erp.c  |   34 ++++
 drivers/s390/block/dasd_eckd.c      |    7 +
 drivers/s390/block/dasd_int.h       |    6 +
 drivers/s390/crypto/zcrypt_api.c    |  120 +++++++++++++
 drivers/s390/crypto/zcrypt_api.h    |    8 +
 drivers/s390/crypto/zcrypt_pcixcc.c |  199 ++++++++++++++++++++++-
 drivers/s390/sysinfo.c              |   23 +++-
 fs/Kconfig                          |    3 +-
 include/asm-s390/page.h             |   29 +++-
 include/asm-s390/pgtable.h          |  158 ++++++++++++++++++
 include/asm-s390/setup.h            |    4 +
 include/asm-s390/smp.h              |    3 +
 include/asm-s390/system.h           |   13 ++
 include/asm-s390/tlbflush.h         |    1 +
 include/asm-s390/topology.h         |   25 +++
 include/linux/hugetlb.h             |   22 +++
 include/linux/sched.h               |    1 +
 include/linux/topology.h            |    2 +
 kernel/sched.c                      |    7 +-
 mm/hugetlb.c                        |   37 +++--
 36 files changed, 1324 insertions(+), 87 deletions(-)
 create mode 100644 arch/s390/kernel/topology.c
 create mode 100644 arch/s390/mm/hugetlbpage.c
##
# git git://git.o-hand.com/linux-rpurdie-backlight	for-linus	backlight
##
Already up-to-date.
##
# git git://git.infradead.org/battery-2.6			master		battery
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/mfasheh/ocfs2.git		ALL	ocfs2
##
Merge made by recursive.
 Documentation/ABI/obsolete/o2cb            |   11 +
 Documentation/ABI/stable/o2cb              |   10 +
 Documentation/feature-removal-schedule.txt |   11 +
 fs/ocfs2/alloc.c                           |  465 +++++++++++++++++++++++++---
 fs/ocfs2/cluster/sys.c                     |    9 +
 fs/ocfs2/cluster/tcp.c                     |   51 +++-
 fs/ocfs2/cluster/tcp_internal.h            |    2 +
 fs/ocfs2/file.c                            |    4 +-
 fs/ocfs2/ioctl.c                           |   12 +-
 fs/ocfs2/ioctl.h                           |    3 +-
 fs/ocfs2/journal.c                         |    3 +-
 fs/ocfs2/localalloc.c                      |    4 +
 fs/ocfs2/namei.c                           |    4 +-
 fs/ocfs2/ocfs2.h                           |   34 ++-
 fs/ocfs2/suballoc.c                        |  103 ++++++-
 fs/ocfs2/suballoc.h                        |    1 +
 fs/ocfs2/super.c                           |    1 +
 fs/sysfs/symlink.c                         |    9 +-
 18 files changed, 645 insertions(+), 92 deletions(-)
 create mode 100644 Documentation/ABI/obsolete/o2cb
 create mode 100644 Documentation/ABI/stable/o2cb
##
# git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git	for-linus	selinux-linus
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git	next		selinux
##
BRANCH next not in tree /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git, SKIPPING
##
# git /pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git	master		sched
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/lethal/sh-2.6.git		master		sh
##
Merge made by recursive.
 arch/sh/Kconfig                      |   11 +-
 arch/sh/Kconfig.debug                |   13 +-
 arch/sh/boards/renesas/migor/setup.c |   56 +++++++-
 arch/sh/boards/se/7722/setup.c       |   41 +++++
 arch/sh/kernel/cpu/sh2a/Makefile     |    7 +-
 arch/sh/kernel/cpu/sh2a/probe.c      |    3 +
 arch/sh/kernel/cpu/sh2a/setup-mxg.c  |  168 +++++++++++++++++++
 arch/sh/kernel/setup.c               |   15 ++
 arch/sh/mm/cache-debugfs.c           |    4 +-
 arch/sh/mm/pmb.c                     |    2 +-
 drivers/input/keyboard/Kconfig       |    9 +
 drivers/input/keyboard/Makefile      |    1 +
 drivers/input/keyboard/sh_keysc.c    |  281 ++++++++++++++++++++++++++++++++
 drivers/rtc/rtc-sh.c                 |  296 +++++++++++++++++++++-------------
 include/asm-sh/bugs.h                |    2 +-
 include/asm-sh/processor.h           |    2 +-
 include/asm-sh/se7722.h              |    2 +
 include/asm-sh/sh_keysc.h            |   13 ++
 include/asm-sh/system.h              |    2 +
 19 files changed, 802 insertions(+), 126 deletions(-)
 create mode 100644 arch/sh/kernel/cpu/sh2a/setup-mxg.c
 create mode 100644 drivers/input/keyboard/sh_keysc.c
 create mode 100644 include/asm-sh/sh_keysc.h
##
# git /pub/scm/linux/kernel/git/ericvh/v9fs		for-linus	v9fs
##
Already up-to-date.
##
# git /pub/scm/linux/kernel/git/ericvh/v9fs		v9fs-devel	v9fs-devel
##
Auto-merged net/9p/error.c
Merge made by recursive.
 fs/9p/fid.h                |   15 +++
 fs/9p/v9fs.c               |   52 ++++++++--
 fs/9p/v9fs.h               |   85 +++++++++++-----
 fs/9p/vfs_addr.c           |    2 +-
 fs/9p/vfs_dir.c            |    2 +-
 fs/9p/vfs_file.c           |   11 +-
 fs/9p/vfs_inode.c          |   50 +++++++---
 fs/9p/vfs_super.c          |    1 +
 include/linux/parser.h     |    2 +-
 include/net/9p/9p.h        |  239 ++++++++++++++++++++++++++++++++++++++------
 include/net/9p/client.h    |   35 +++++++
 include/net/9p/transport.h |   43 ++++++++
 lib/parser.c               |   32 ++++--
 net/9p/client.c            |   32 +++++--
 net/9p/conv.c              |  128 +++++++++++++++++++++++-
 net/9p/error.c             |   11 ++-
 net/9p/fcprint.c           |    8 ++
 net/9p/mod.c               |    7 +-
 net/9p/trans_fd.c          |  175 +++++++++++++++++++++++++++------
 net/9p/trans_virtio.c      |  173 ++++++++++++++++++++++++++++----
 net/9p/util.c              |   32 +++++-
 21 files changed, 966 insertions(+), 169 deletions(-)
##
# git /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git master		watchdog
##
Already up-to-date.
##
# git git://oss.sgi.com:8090/xfs/xfs-2.6.git		 master		xfs
##
Auto-merged fs/xfs/xfs_iget.c
Merge made by recursive.
 fs/xfs/linux-2.6/xfs_aops.c    |    4 +-
 fs/xfs/linux-2.6/xfs_export.c  |   11 +-
 fs/xfs/linux-2.6/xfs_file.c    |   13 +-
 fs/xfs/linux-2.6/xfs_fs_subr.c |   36 +--
 fs/xfs/linux-2.6/xfs_ioctl.c   |  562 +++++++++++++++-------------------
 fs/xfs/linux-2.6/xfs_iops.c    |  180 ++++++------
 fs/xfs/linux-2.6/xfs_linux.h   |    1 -
 fs/xfs/linux-2.6/xfs_lrw.c     |   53 ++--
 fs/xfs/linux-2.6/xfs_super.c   |    3 +-
 fs/xfs/linux-2.6/xfs_vnode.h   |   19 +-
 fs/xfs/quota/xfs_qm.c          |    6 +-
 fs/xfs/quota/xfs_qm_bhv.c      |    2 +-
 fs/xfs/quota/xfs_qm_syscalls.c |    4 +-
 fs/xfs/support/ktrace.c        |   37 ++--
 fs/xfs/support/ktrace.h        |    3 +-
 fs/xfs/xfs_attr_leaf.c         |    6 +-
 fs/xfs/xfs_bmap.c              |   26 +-
 fs/xfs/xfs_bmap_btree.h        |    2 +-
 fs/xfs/xfs_dir2.c              |    2 +-
 fs/xfs/xfs_fsops.c             |   24 +-
 fs/xfs/xfs_ialloc.c            |    6 +-
 fs/xfs/xfs_iget.c              |   49 +---
 fs/xfs/xfs_inode.c             |  661 ++++++++++++++++++++--------------------
 fs/xfs/xfs_inode.h             |   23 +--
 fs/xfs/xfs_inode_item.c        |    4 +-
 fs/xfs/xfs_inode_item.h        |    8 +
 fs/xfs/xfs_itable.c            |    5 +-
 fs/xfs/xfs_log.c               |   61 ++--
 fs/xfs/xfs_log_priv.h          |    6 +-
 fs/xfs/xfs_log_recover.c       |   19 +-
 fs/xfs/xfs_mount.c             |   49 ++-
 fs/xfs/xfs_mount.h             |   24 +-
 fs/xfs/xfs_rename.c            |   45 +--
 fs/xfs/xfs_sb.h                |  106 +++----
 fs/xfs/xfs_trans.h             |    1 -
 fs/xfs/xfs_trans_buf.c         |    3 +-
 fs/xfs/xfs_utils.c             |   28 +--
 fs/xfs/xfs_utils.h             |    1 -
 fs/xfs/xfs_vfsops.c            |   38 +--
 fs/xfs/xfs_vnodeops.c          |  328 ++++++---------------
 fs/xfs/xfs_vnodeops.h          |   14 +-
 41 files changed, 1042 insertions(+), 1431 deletions(-)
##
# git /pub/scm/linux/kernel/git/czankel/xtensa-2.6.git	 testing	xtensa
##
Removed arch/xtensa/boot/ramdisk/Makefile
Merge made by recursive.
 arch/xtensa/Kconfig               |   65 ++++++++++++++++++++++++-----------
 arch/xtensa/Makefile              |   68 +++++++++++++-----------------------
 arch/xtensa/boot/ramdisk/Makefile |   23 ------------
 arch/xtensa/configs/iss_defconfig |    2 +
 4 files changed, 71 insertions(+), 87 deletions(-)
 delete mode 100644 arch/xtensa/boot/ramdisk/Makefile
##
# gitfetch /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master		x86
##
##
# merge x86 resolve /home/jejb/x86-fixup.diff
##
Auto-merged Documentation/kernel-parameters.txt
Auto-merged arch/arm/Kconfig
Auto-merged arch/x86/Kconfig
Auto-merged arch/x86/kernel/Makefile
Auto-merged arch/x86/kernel/setup_32.c
Auto-merged arch/x86/kernel/setup_64.c
Removed arch/x86/kernel/smp_32.c
Removed arch/x86/kernel/smp_64.c
Auto-merged arch/x86/kernel/traps_32.c
Auto-merged arch/x86/kernel/traps_64.c
Removed arch/x86/lib/bitops_32.c
Removed arch/x86/mach-rdc321x/wdt.c
Removed arch/x86/mm/Makefile_32
Removed arch/x86/mm/Makefile_64
Auto-merged arch/x86/pci/acpi.c
CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c
Auto-merged arch/x86/pci/common.c
Auto-merged arch/x86/pci/pci.h
CONFLICT (content): Merge conflict in arch/x86/pci/pci.h
Auto-merged drivers/base/core.c
Auto-merged drivers/misc/Makefile
Auto-merged drivers/pci/probe.c
Removed include/asm-x86/mach-default/mach_reboot.h
Auto-merged include/linux/ide.h
Auto-merged include/linux/pci.h
Auto-merged include/linux/sched.h
Auto-merged include/linux/skbuff.h
Auto-merged include/net/inet_sock.h
Auto-merged include/net/tcp.h
Auto-merged init/main.c
Auto-merged lib/Kconfig.debug
Created commit 05369a4: Resolve Patch: /home/jejb/x86-fixup.diff
##
# git /pub/scm/linux/kernel/git/aegl/linux-2.6.git	release		ia64-release
##
Already up-to-date.
##
# quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/	doc
##
2.6.25-rc5-git2 to baadac8b10c5ac15ce3d26b68fa266c8889b163f
Using base baadac8b10c5ac15ce3d26b68fa266c8889b163f
docbook-audit-prms.patch
docsrc-spi-split-fix.patch
kconfig_allconfig_docv2.patch
move-smart-config.patch
kerndoc-dup-section-name-err.patch
##
# merge doc
##
Auto-merged Documentation/00-INDEX
Auto-merged scripts/kernel-doc
Merge made by recursive.
 Documentation/00-INDEX                      |    2 -
 Documentation/kbuild/00-INDEX               |    4 +
 Documentation/kbuild/make-configs.txt       |  188 +++++++++++++++++++++++++++
 Documentation/{ => kbuild}/smart-config.txt |    2 +-
 Documentation/spi/spidev                    |  168 +-----------------------
 Documentation/spi/spidev_fdx.c              |  158 ++++++++++++++++++++++
 README                                      |   32 +++--
 kernel/audit.c                              |    4 +-
 scripts/kernel-doc                          |   20 ++-
 9 files changed, 388 insertions(+), 190 deletions(-)
 create mode 100644 Documentation/kbuild/make-configs.txt
 rename Documentation/{ => kbuild}/smart-config.txt (99%)
 create mode 100644 Documentation/spi/spidev_fdx.c
##
# git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git	testing		lm-sensors
##
Merge made by recursive.
 Documentation/hwmon/w83l785ts |    3 ++-
 drivers/hwmon/asb100.c        |    4 ----
 drivers/hwmon/dme1737.c       |    5 +++++
 drivers/hwmon/f71805f.c       |    5 +++++
 drivers/hwmon/f71882fg.c      |    5 +++++
 drivers/hwmon/it87.c          |    5 +++++
 drivers/hwmon/lm75.c          |    5 +----
 drivers/hwmon/pc87360.c       |    6 ++++++
 drivers/hwmon/pc87427.c       |    5 +++++
 drivers/hwmon/sis5595.c       |    5 +++++
 drivers/hwmon/smsc47b397.c    |   22 +++++++++++++++++++---
 drivers/hwmon/smsc47m1.c      |    5 +++++
 drivers/hwmon/via686a.c       |    5 +++++
 drivers/hwmon/vt1211.c        |    5 +++++
 drivers/hwmon/vt8231.c        |    5 +++++
 drivers/hwmon/w83627ehf.c     |    6 ++++++
 drivers/hwmon/w83627hf.c      |    5 +++++
 drivers/hwmon/w83793.c        |   26 ++++++++++++++------------
 drivers/hwmon/w83l785ts.c     |    4 ++--
 19 files changed, 105 insertions(+), 26 deletions(-)
##
# git git://git.infradead.org/~dedekind/ubi-2.6.git	master		ubi
##
Merge made by recursive.
 Documentation/ABI/stable/sysfs-class-ubi           |  212 ++++++++++++++++++++
 drivers/mtd/ubi/build.c                            |   18 +-
 drivers/mtd/ubi/debug.h                            |    2 +
 drivers/mtd/ubi/io.c                               |    4 +
 .../ubi-header.h => drivers/mtd/ubi/ubi-media.h    |    8 +-
 drivers/mtd/ubi/ubi.h                              |    3 +-
 include/mtd/Kbuild                                 |    1 -
 7 files changed, 231 insertions(+), 17 deletions(-)
 create mode 100644 Documentation/ABI/stable/sysfs-class-ubi
 rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%)
##
# git /pub/scm/linux/kernel/git/teigland/dlm.git		next		dlm
##
Merge made by recursive.
 fs/dlm/config.c |    2 +-
 fs/dlm/lock.c   |    5 ++---
 fs/dlm/lock.h   |    1 -
 3 files changed, 3 insertions(+), 5 deletions(-)
##
# git /pub/scm/linux/kernel/git/kyle/parisc-2.6.git	master		parisc
##
Auto-merged MAINTAINERS
Merge made by recursive.
 MAINTAINERS                                        |    9 ++++++
 arch/parisc/Makefile                               |    3 ++
 .../{defconfig => configs/default_defconfig}       |    0 
 arch/parisc/kernel/firmware.c                      |   27 +++++++++++------
 arch/parisc/kernel/hardware.c                      |   13 ++++++++-
 arch/parisc/kernel/head.S                          |    7 ++--
 arch/parisc/kernel/pdc_cons.c                      |   30 ++++++++++---------
 arch/parisc/kernel/syscall_table.S                 |    5 ++-
 arch/parisc/kernel/traps.c                         |   25 ++++++++++++++--
 drivers/parisc/pdc_stable.c                        |    6 ++--
 include/asm-parisc/elf.h                           |   22 ++++++--------
 include/asm-parisc/fixmap.h                        |    9 +++++-
 include/asm-parisc/futex.h                         |   10 +++++-
 include/asm-parisc/pdc.h                           |    3 +-
 include/asm-parisc/pgalloc.h                       |    4 +-
 include/asm-parisc/pgtable.h                       |    8 -----
 include/asm-parisc/unistd.h                        |    5 ++-
 17 files changed, 123 insertions(+), 63 deletions(-)
 rename arch/parisc/{defconfig => configs/default_defconfig} (100%)
##
# git /pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git	for-linus	blackfinquilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/	m68k
##
Already up-to-date.
##
# merge m68k
##
MERGE m68k not in tree, SKIPPING
##
# git /pub/scm/linux/kernel/git/tytso/ext4.git	next	ext4
##
Merge made by recursive.
 fs/ext4/balloc.c           |   29 +++++--
 fs/ext4/dir.c              |    2 +-
 fs/ext4/extents.c          |  203 +++++++++++++++++++++++++++++++++++++++++---
 fs/ext4/file.c             |   21 ++++-
 fs/ext4/fsync.c            |    3 +
 fs/ext4/ialloc.c           |  112 ++++++++++++++++++++++--
 fs/ext4/inode.c            |   35 ++++----
 fs/ext4/ioctl.c            |   12 +--
 fs/ext4/mballoc.c          |   63 ++++++--------
 fs/ext4/namei.c            |   11 ++-
 fs/ext4/resize.c           |    6 +-
 fs/ext4/super.c            |   63 +++++++++++++-
 fs/ext4/xattr.c            |   16 ++--
 fs/ext4/xattr.h            |    7 --
 fs/jbd2/commit.c           |   19 +----
 fs/jbd2/journal.c          |   13 ++--
 fs/jbd2/revoke.c           |    4 +-
 fs/jbd2/transaction.c      |   34 +++++++-
 include/linux/ext4_fs.h    |   29 ++++++-
 include/linux/ext4_fs_sb.h |    3 +
 20 files changed, 534 insertions(+), 151 deletions(-)
##
# git /pub/scm/linux/kernel/git/jack/linux-udf-2.6.git	for_next	udf
##
Auto-merged include/linux/Kbuild
Removed include/linux/udf_fs.h
Removed include/linux/udf_fs_sb.h
Merge made by recursive.
 fs/udf/balloc.c           |   13 +-
 fs/udf/crc.c              |    4 +-
 fs/udf/dir.c              |   83 ++----
 fs/udf/ecma_167.h         |   13 -
 fs/udf/file.c             |   47 ---
 fs/udf/ialloc.c           |   13 +-
 fs/udf/inode.c            |  187 +++---------
 fs/udf/lowlevel.c         |    1 -
 fs/udf/misc.c             |    1 -
 fs/udf/namei.c            |  197 +++++---------
 fs/udf/partition.c        |    1 -
 fs/udf/super.c            |  697 +++++++++++++++++++--------------------------
 fs/udf/symlink.c          |    1 -
 fs/udf/truncate.c         |   81 ++----
 fs/udf/udf_i.h            |   30 ++-
 fs/udf/udf_sb.h           |   93 ++++++
 fs/udf/udfdecl.h          |   64 +++--
 fs/udf/udfend.h           |   22 --
 fs/udf/udftime.c          |   35 ++--
 fs/udf/unicode.c          |   59 ++---
 include/linux/Kbuild      |    2 +-
 include/linux/udf_fs.h    |   51 ----
 include/linux/udf_fs_i.h  |   31 --
 include/linux/udf_fs_sb.h |  117 --------
 24 files changed, 682 insertions(+), 1161 deletions(-)
 delete mode 100644 include/linux/udf_fs.h
 delete mode 100644 include/linux/udf_fs_sb.h
##
# gitfetch /pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git	next	powerpc-4xx
##
##
# merge powerpc-4xx resolve /home/jejb/powerpc-4xx-fixup.diff
##
Auto-merged arch/powerpc/boot/Makefile
Auto-merged arch/powerpc/boot/cuboot-taishan.c
Auto-merged arch/powerpc/boot/cuboot-warp.c
Merge made by recursive.
 Documentation/powerpc/booting-without-of.txt |   16 -
 arch/powerpc/boot/Makefile                   |    3 +-
 arch/powerpc/boot/bamboo.c                   |    3 +-
 arch/powerpc/boot/cuboot-rainier.c           |    3 +-
 arch/powerpc/boot/cuboot-sequoia.c           |    3 +-
 arch/powerpc/boot/cuboot-taishan.c           |    3 +-
 arch/powerpc/boot/cuboot-warp.c              |    2 +-
 arch/powerpc/boot/cuboot-yosemite.c          |   44 ++
 arch/powerpc/boot/dts/bamboo.dts             |    2 -
 arch/powerpc/boot/dts/canyonlands.dts        |  391 ++++++++++++++
 arch/powerpc/boot/dts/ebony.dts              |    2 -
 arch/powerpc/boot/dts/rainier.dts            |    2 -
 arch/powerpc/boot/dts/sequoia.dts            |    2 -
 arch/powerpc/boot/dts/taishan.dts            |    4 -
 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/treeboot-walnut.c          |    2 +-
 arch/powerpc/configs/canyonlands_defconfig   |  721 ++++++++++++++++++++++++++
 arch/powerpc/kernel/cpu_setup_44x.S          |    5 +-
 arch/powerpc/kernel/cputable.c               |   28 +-
 arch/powerpc/platforms/44x/Kconfig           |   27 +
 arch/powerpc/platforms/44x/Makefile          |    2 +
 arch/powerpc/platforms/44x/canyonlands.c     |   64 +++
 arch/powerpc/sysdev/ppc4xx_pci.c             |  114 ++++
 arch/powerpc/sysdev/ppc4xx_pci.h             |   59 +++
 27 files changed, 1771 insertions(+), 40 deletions(-)
 create mode 100644 arch/powerpc/boot/cuboot-yosemite.c
 create mode 100644 arch/powerpc/boot/dts/canyonlands.dts
 create mode 100644 arch/powerpc/boot/dts/yosemite.dts
 create mode 100644 arch/powerpc/configs/canyonlands_defconfig
 create mode 100644 arch/powerpc/platforms/44x/canyonlands.c
WARNING: Merge successful but resolve requested
##
# check
##
Differences exist, continuing
##
# label
##
Created commit ebdf0f7: 2.6.25-rc5-mc5
 1 files changed, 1 insertions(+), 1 deletions(-)
##
# diff /pub/linux/kernel/people/jejb/merge-tree/patch-
##
##
# log /pub/linux/kernel/people/jejb/merge-tree/log-
##