Switched to branch "2.6.25-rc9-mc7"
remote: Counting objects: 36, done.
remote: Compressing objects:   3% (1/27)   
remote: Compressing objects:   7% (2/27)   
remote: Compressing objects:  11% (3/27)   
remote: Compressing objects:  14% (4/27)   
remote: Compressing objects:  18% (5/27)   
remote: Compressing objects:remote:   22% (6/27)   
remote: Compressing objects:  25% (7/27)   
remote: Compressing objects:  29% (8/27)   
remote: Compressing objects:  33% (9/27)   
remote: CompremotRemoved drivers/scsi/scsi_debug.h
Merge made by recursive.
 Documentation/scsi/st.txt                 |   12 +-
 arch/ia64/hp/sim/simscsi.c                |   23 +-
 drivers/ata/libata-scsi.c                 |    6 +-
 drivers/base/transport_class.c            |    3 +-
 drivers/message/fusion/mptbase.c          |   29 +-
 drivers/message/fusion/mptbase.h          |    5 +-
 drivers/message/fusion/mptsas.c           |   22 +-
 drivers/message/fusion/mptscsih.c         |    8 +-
 drivers/s390/scsi/zfcp_aux.c              |   33 +-
 drivers/s390/scsi/zfcp_ccw.c              |   21 +-
 drivers/s390/scsi/zfcp_dbf.c              | 1283 ++++++++++++++++++-----------
 drivers/s390/scsi/zfcp_dbf.h              |  229 +++++
 drivers/s390/scsi/zfcp_def.h              |  169 +----
 drivers/s390/scsi/zfcp_erp.c              |  680 +++++-----------
 drivers/s390/scsi/zfcp_ext.h              |   57 +-
 drivers/s390/scsi/zfcp_fsf.c              |  410 +++-------
 drivers/s390/scsi/zfcp_qdio.c             |    6 +-
 drivers/s390/scsi/zfcp_scsi.c             |   68 +-
 drivers/s390/scsi/zfcp_sysfs_adapterSwitched to branch "ide"
Context reduced to (2/2) to apply fragment at 618
Checking out files:  14% (48/334)   
Checking out files:  15% (51/334)   
Checking out files:  16% (54/334)   
Checking out files:  17% (57/334)   
Checking out files:  18% (61/334)   
Checking out files:  19% (64/334)   
Checking out files:  20% (67/334)   
Checking out files:  21% (71/334)   
Checking out files:  22% (74/334)   
Checking out files:  23% (77/334)   
Checking out files:  24% (81/334)   
Checking out files:  24% (83/334)   
Checking out files:  25% (84/334)   
Checking out files:  26% (87/334)   
Checking out files:  27% (91/334)   
Checking out files:  28% (94/334)   
Checking out files:  29% (97/334)   
Checking out files:  29% (100/334)   
Checking out files:  30% (101/334)   
Checking out files:  31% (104/334)   
Checking out files:  32% (107/334)   
Checking out files:  33% (111/334)   
Checking out files:  34% (114/334)   
Checking out files:  35% (117/334)   
Checking out files:  36% (121/334)   
Checking out files:  37% (124/334)   
Checking out files:  38% (127/334)   
Checking out files:  39% (131/334)   
Checking out files:  40% (134/334)   
Checking out files:  41% (137/334)   
Checking out files:  42% (141/334)   
Checking out files:  43% (144/334)   
Checking out files:  44% (147/334)   
Checking out files:  45% (151/334)   
Checking out files:  46% (154/334)   
Checking out files:  47% (157/334)   
Checking out files:  48% (161/334)   
Checking out files:  49% (164/334)   
Checking out files:  50% (167/334)   
Checking out files:  51% (171/334)   
Checking out files:  52% (174/334)   
Checking out files:  53% (178/334)   
Checking out files:  54% (181/334)   
Checking out files:  55% (184/334)   
Checking out files:  56% (188/334)   
Checking out files:  57% (191/334)   
Checking out files:  58% (194/334)   
Checking out files:  59% (198/334)   
Checking out files:  60% (201/334)   
Checking out files:  61% (204/334)   
Checking out files:  62% (208/334)   
Checking out files:  63% (211/334)   
Checking out files:  64% (214/334)   
Checking out files:  65% (218/334)   
Checking out files:  66% (221/334)   
Checking out files:  67% (224/334)   
Checking out files:  68% (228/334)   
Checking out files:  69% (231/334)   
Checking out files:  70% (234/334)   
Checking out files:  71% (238/334)   
Checking out files:  72% (241/334)   
Checking out files:  73% (244/334)   
Checking out files:  74% (248/334)   
Checking out files:  75% (251/334)   
Checking out files:  76% (254/334)   
Checking out files:  77% (258/334)   
Checking out files:  78% (261/334)   
Checking out files:  79% (264/334)   
Checking out files:  80% (268/334)   
Checking out files:  81% (271/334)   
Checking out files:  82% (274/334)   
Checking out files:  83% (278/334)   
Checking out files:  84% (281/334)   
Checking out files:  85% (284/334)   
Checking out files:  86% (288/334)   
Checking out files:  87% (291/334)   
Checking out files:  88% (294/334)   
Checking out files:  89% (298/334)   
Checking out files:  90% (301/334)   
Checking out files:  91% (304/334)   
Checking out files:  92% (308/334)   
Checking out files:  93% (311/334)   
Checking out files:  94% (314/334)   
Checking out files:  95% (318/334)   
Checking out files:  96% (321/334)   
Checking out files:  97% (324/334)   
Checking out files:  98% (328/334)   
Checking out files:  99% (331/334)   
Checking out files: 100% (334/334)   
Checking out files: 100% (334/334), done.
Switched to branch "2.6.25-rc9-mc7"
Already on "2.6.25-rc9-mc7"
remote: Counting objects: 626, done.
remote: Compressing objects:   1% (1/67)   
remote: Compressing objects:   2% (2/67)   
remote: Compressing objects:   4% (remote: 3/67)   
remote: Compressing objects:   5% (4/67)   
remote: Compressing objects:   7% (5/67)   
remote: Compressing objects:   8% (6/67)   
remote: Compressingremote:  objects:  10% (7/67)   
remote: Compressing objects:  11% (8/67)   
remote: Compressing objects:  13% (9/67)   
remote: Compressing objects:  14% (10/6remote: 7)   
remote: Compressing objects:  16% (11/67)   
remote: Compressing objects:  17% (12/67)   
remote: Compressing objects:  19% (13/67)   
remote: Compressingremote:  objects:  20% (14/67)   
remote: Compressing objects:  22% (15/67)   
remote: Compressing objects:  23% (16/67)   
remote: Compressing objects:  25% (1remote: 7/67)   
remote: Compressing objects:  26% (18/67)   
remote: Compressing objects:  28% (19/67)   
remote: Compressing objects:  29% (20/67)   
remote: Compressremote: ing objects:  31% (21/67)   
remote: Compressing objects:  32% (22/67)   
remote: Compressing objects:  34% (23/67)   
remote: Compressing objects:  35%remote:  (24/67)   
remote: Compressing objects:  37% (25/67)   
remote: Compressing objects:  38% (26/67)   
remote: Compressing objects:  40% (27/67)   
remote: ComprReceiving objects:   0% (1/426)   
Receiving objects:   1% (5/426)   
Receiving objects:   2% (9/426)   
Receiving objects:   3% (13/426)   
Receiving objects:   4% (18/426)   
remote: essing objects:  41% (28/67)   
remote: Compressing objects:  43% (29/67)   
remote: Compressing objects:  44% (30/67)   
remote: Compressing objects:  Receiving objects:   5% (22/426)   
Receiving objects:   6% (26/426)   
Receiving objects:   7% (30/426)   
remote: 46% (31/67)   
remote: Compressing objects:  47% (32/67)   
remote: Compressing objects:  49% (33/67)   
remote: Compressing objects:  50% (34/67)   
remote: CoReceiving objects:   8% (35/426)   
Receiving objects:   9% (39/426)   
Receiving objects:  10% (43/426)   
remote: mpressing objects:  52% (35/67)   
remote: Compressing objects:  53% (36/67)   
remote: Compressing objects:  55% (37/67)   
remote: Compressing objectsReceiving objects:  11% (47/426)   
Receiving objects:  12% (52/426)   
Receiving objects:  13% (56/426)   
Receiving objects:  14% (60/426)   
Receiving objects:  15% (64/426)   
Receiving objects:  16% (69/426)   
Receiving objects:  17% (73/426)   
Receiving objects:  18% (77/426)   
Receiving objects:  19% (81/426)   
remote: :  56% (38/67)   
remote: Compressing objects:  58% (39/67)   
remote: Compressing objects:  59% (40/67)   
remote: Compressing objects:  61% (41/67)   Receiving objects:  20% (86/426)   
Receiving objects:  21% (90/426)   
Receiving objects:  22% (94/426)   
Receiving objects:  23% (98/426)   
Receiving objects:  24% (103/426)   
Receiving objects:  25% (107/426)   
Receiving objects:  26% (111/426)   
Receiving objects:  27% (116/426)   
Receiving objects:  28% (120/426)   
Receiving objects:  29% (124/426)   
Receiving objects:  30% (128/426)   
Receiving objects:  31% (133/426)   
Receiving objects:  32% (137/426)   
Receiving objects:  33% (141/426)   
Receiving objects:  34% (145/426)   
Receiving objects:  35% (150/426)   
Receiving objects:  36% (154/426)   
Receiving objects:  37% (158/426)   
Receiving objects:  38% (162/426)   
Receiving objects:  39% (167/426)   
Receiving objects:  40% (171/426)   
Receiving objects:  41% (175/426)   
Receiving objects:  42% (179/426)   
Receiving objects:  43% (184/426)   
Receiving objects:  44% (188/426)   
Receiving objects:  45% (192/426)   
Receiving objects:  46% (196/426)   
Receiving objects:  47% (201/426)   
Receiving objects:  48% (205/426)   
Receiving objects:  49% (209/426)   
Receiving objects:  50% (213/426)   
Receiving objects:  51% (218/426)   
Receiving objects:  52% (222/426)   
Receiving objects:  53% (226/426)   
remote: 
remote: Compressing objects:  62% (42/67)   
remote: Compressing objects:  64% (43/67)   
remote: Compressing objects:  65% (44/67)   
remote: Compressing objeremote: cts:  67% (45/67)   
remote: Compressing objects:  68% (46/67)   
remote: Compressing objects:  70% (47/67)   
remote: Compressing objects:  71% (48/67)remote:    
remote: Compressing objects:  73% (49/67)   
remote: Compressing objects:  74% (50/67)   
remote: Compressing objects:  76% (51/67)   
remote: Compressing oremote: bjects:  77% (52/67)   
remote: Compressing objects:  79% (53/67)   
remote: Compressing objects:  80% (54/67)   
remote: Compressing objects:  82% (55/remote: 67)   
remote: Compressing objects:  83% (56/67)   
remote: Compressing objects:  85% (57/67)   
remote: Compressing objects:  86% (58/67)   
remote: Compressinremote: g objects:  88% (59/67)   
remote: Compressing objects:  89% (60/67)   
remote: Compressing objects:  91% (61/67)   
remote: Compressing objects:  92% (remote: 62/67)   
remote: Compressing objects:  94% (63/67)   
remote: Compressing objects:  95% (64/67)   
remote: Compressing objects:  97% (65/67)   
remote: Compresremote: sing objects:  98% (66/67)   
remote: Compressing objects: 100% (67/67)   
remote: Compressing objects: 100% (67/67), done.
remote: Total 426 (delta 359remote: ), reused 426 (delta 359)
Receiving objects:  54% (231/426)   
Receiving objects:  55% (235/426)   
Receiving objects:  56% (239/426)   
Receiving objects:  57% (243/426)   
Receiving objects:  58% (248/426)   
Receiving objects:  59% (252/426)   
Receiving objects:  60% (256/426)   
Receiving objects:  61% (260/426)   
Receiving objects:  62% (265/426)   
Receiving objects:  63% (269/426)   
Receiving objects:  64% (273/426)   
Receiving objects:  65% (277/426)   
Receiving objects:  66% (282/426)   
Receiving objects:  67% (286/426)   
Receiving objects:  68% (290/426)   
Receiving objects:  69% (294/426)   
Receiving objects:  70% (299/426)   
Receiving objects:  71% (303/426)   
Receiving objects:  72% (307/426)   
Receiving objects:  73% (311/426)   
Receiving objects:  74% (316/426)   
Receiving objects:  75% (320/426)   
Receiving objects:  76% (324/426)   
Receiving objects:  77% (329/426)   
Receiving objects:  78% (333/426)   
Receiving objects:  79% (337/426)   
Receiving objects:  80% (341/426)   
Receiving objects:  81% (346/426)   
Receiving objects:  82% (350/426)   
Receiving objects:  83% (354/426)   
Receiving objects:  84% (358/426)   
Receiving objects:  85% (363/426)   
Receiving objects:  86% (367/426)   
Receiving objects:  87% (371/426)   
Receiving objects:  88% (375/426)   
Receiving objects:  89% (380/426)   
Receiving objects:  90% (384/426)   
Receiving objects:  91% (388/426)   
Receiving objects:  92% (392/426)   
Receiving objects:  93% (397/426)   
Receiving objects:  94% (401/426)   
Receiving objects:  95% (405/426)   
Receiving objects:  96% (409/426)   
Receiving objects:  97% (414/426)   
Receiving objects:  98% (418/426)   
Receiving objects:  99% (422/426)   
Receiving objects: 100% (426/426)   
Receiving objects: 100% (426/426), 107.52 KiB, done.
Resolving deltas:   0% (1/359)   
Resolving deltas:   1% (5/359)   
Resolving deltas:   2% (8/359)   
Resolving deltas:   3% (12/359)   
Resolving deltas:  15% (54/359)   
Resolving deltas:  16% (59/359)   
Resolving deltas:  17% (62/359)   
Resolving deltas:  18% (65/359)   
Resolving deltas:  20% (72/359)   
Resolving deltas:  21% (77/359)   
Resolving deltas:  22% (80/359)   
Resolving deltas:  23% (83/359)   
Resolving deltas:  24% (87/359)   
Resolving deltas:  32% (115/359)   
Resolving deltas:  37% (133/359)   
Resolving deltas:  38% (137/359)   
Resolving deltas:  39% (142/359)   
Resolving deltas:  40% (144/359)   
Resolving deltas:  41% (148/359)   
Resolving deltas:  42% (151/359)   
Resolving deltas:  43% (155/359)   
Resolving deltas:  44% (158/359)   
Resolving deltas:  45% (162/359)   
Resolving deltas:  46% (166/359)   
Resolving deltas:  47% (169/359)   
Resolving deltas:  48% (173/359)   
Resolving deltas:  49% (176/359)   
Resolving deltas:  50% (180/359)   
Resolving deltas:  51% (184/359)   
Resolving deltas:  52% (187/359)   
Resolving deltas:  53% (191/359)   
Resolving deltas:  54% (194/359)   
Resolving deltas:  55% (198/359)   
Resolving deltas:  56% (202/359)   
Resolving deltas:  57% (206/359)   
Resolving deltas:  58% (209/359)   
Resolving deltas:  59% (212/359)   
Resolving deltas:  60% (216/359)   
Resolving deltas:  61% (219/359)   
Resolving deltas:  62% (223/359)   
Resolving deltas:  63% (227/359)   
Resolving deltas:  64% (230/359)   
Resolving deltas:  65% (234/359)   
Resolving deltas:  66% (237/359)   
Resolving deltas:  67% (241/359)   
Resolving deltas:  68% (245/359)   
Resolving deltas:  69% (248/359)   
Resolving deltas:  70% (252/359)   
Resolving deltas:  71% (255/359)   
Resolving deltas:  72% (260/359)   
Resolving deltas:  73% (263/359)   
Resolving deltas:  74% (267/359)   
Resolving deltas:  75% (270/359)   
Resolving deltas:  79% (286/359)   
Resolving deltas:  83% (301/359)   
Resolving deltas:  84% (302/359)   
Resolving deltas:  85% (308/359)   
Resolving deltas:  86% (309/359)   
Resolving deltas:  87% (313/359)   
Resolving deltas:  88% (316/359)   
Resolving deltas:  89% (320/359)   
Resolving deltas:  90% (324/359)   
Resolving deltas:  90% (325/359)   
Resolving deltas:  91% (327/359)   
Resolving deltas:  92% (331/359)   
Resolving deltas:  93% (334/359)   
Resolving deltas:  94% (340/359)   
Resolving deltas:  95% (343/359)   
Resolving deltas:  96% (345/359)   
Resolving deltas:  97% (349/359)   
Resolving deltas:  98% (355/359)   
Resolving deltas:  99% (358/359)   
Resolving deltas: 100% (359/359)   
Resolving deltas: 100% (359/359), completed with 190 local objects.
From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6
 + 2b159a4...2040cea gregkh-driver -> scsi-driverbase  (forced update)
From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6
   d10d89e..a985aab  gregkh-driver-base -> scsi-driverbase-base
Switched to branch "gregkh-driver"
Switched to branch "2.6.25-rc9-mc7"
Checking out files:   1% (9/470)   
Checking out files:   2% (10/470)   
Checking out files:   2% (13/470)   
Checking out files:   3% (15/470)   
Checking out files:   3% (16/470)   
Checking out files:   4% (19/470)   
Checking out files:   5% (24/470)   
Checking out files:   6% (29/470)   
Checking out files:   7% (33/470)   
Checking out files:   8% (38/470)   
Checking out files:   9% (43/470)   
Checking out files:  10% (47/470)   
Checking out files:  11% (52/470)   
Checking out files:  12% (57/470)   
Checking out files:  13% (62/470)   
Checking out files:  13% (63/470)   
Checking out files:  14% (66/470)   
Checking out files:  15% (71/470)   
Checking out files:  15% (72/470)   
Checking out files:  16% (76/470)   
Checking out files:  17% (80/470)   
Checking out files:  18% (85/470)   
Checking out files:  19% (90/470)   
Checking out files:  20% (94/470)   
Checking out files:  21% (99/470)   
Checking out files:  22% (104/470)   
Checking out files:  23% (109/470)   
Checking out files:  24% (113/470)   
Checking out files:  25% (118/470)   
Checking out files:  26% (123/470)   
Checking out files:  27% (127/470)   
Checking out files:  28% (132/470)   
Checking out files:  29% (137/470)   
Checking out files:  30% (141/470)   
Checking out files:  31% (146/470)   
Checking out files:  32% (151/470)   
Checking out files:  33% (156/470)   
Checking out files:  34% (160/470)   
Checking out files:  35% (165/470)   
Checking out files:  36% (170/470)   
Checking out files:  37% (174/470)   
Checking out files:  38% (179/470)   
Checking out files:  39% (184/470)   
Checking out files:  40% (188/470)   
Checking out files:  41% (193/470)   
Checking out files:  42% (198/470)   
Checking out files:  43% (203/470)   
Checking out files:  44% (207/470)   
Checking out files:  45% (212/470)   
Checking out files:  46% (217/470)   
Checking out files:  47% (221/470)   
Checking out files:  48% (226/470)   
Checking out files:  49% (231/470)   
Checking out files:  50% (235/470)   
Checking out files:  51% (240/470)   
Checking out files:  52% (245/470)   
Checking out files:  53% (250/470)   
Checking out files:  54% (254/470)   
Checking out files:  55% (259/470)   
Checking out files:  56% (264/470)   
Checking out files:  57% (268/470)   
Checking out files:  58% (273/470)   
Checking out files:  59% (278/470)   
Checking out files:  60% (282/470)   
Checking out files:  61% (287/470)   
Checking out files:  62% (292/470)   
Checking out files:  63% (297/470)   
Checking out files:  64% (301/470)   
Checking out files:  65% (306/470)   
Checking out files:  66% (311/470)   
Checking out files:  67% (315/470)   
Checking out files:  68% (320/470)   
Checking out files:  69% (325/470)   
Checking out files:  70% (329/470)   
Checking out files:  71% (334/470)   
Checking out files:  72% (339/470)   
Checking out files:  73% (344/470)   
Checking out files:  74% (348/470)   
Checking out files:  75% (353/470)   
Checking out files:  76% (358/470)   
Checking out files:  77% (362/470)   
Checking out files:  78% (367/470)   
Checking out files:  79% (372/470)   
Checking out files:  80% (376/470)   
Checking out files:  81% (381/470)   
Checking out files:  82% (386/470)   
Checking out files:  83% (391/470)   
Checking out files:  84% (395/470)   
Checking out files:  85% (400/470)   
Checking out files:  86% (405/470)   
Checking out files:  87% (409/470)   
Checking out files:  88% (414/470)   
Checking out files:  89% (419/470)   
Checking out files:  90% (423/470)   
Checking out files:  91% (428/470)   
Checking out files:  92% (433/470)   
Checking out files:  93% (438/470)   
Checking out files:  94% (442/470)   
Checking out files:  95% (447/470)   
Checking out files:  96% (452/470)   
Checking out files:  97% (456/470)   
Checking out files:  98% (461/470)   
Checking out files:  99% (466/470)   
Checking out files: 100% (470/470)   
Checking out files: 100% (470/470), done.
Switched to branch "gregkh-driver"
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Finished one revert.
Switched to branch "2.6.25-rc9-mc7"
Switched to branch "gregkh-pci"
Checking out files:  12% (51/402)   
Checking out files:  13% (53/402)   
Checking out files:  14% (57/402)   
Checking out files:  15% (61/402)   
Checking out files:  16% (65/402)   
Checking out files:  17% (69/402)   
Checking out files:  18% (73/402)   
Checking out files:  19% (77/402)   
Checking out files:  20% (81/402)   
Checking out files:  21% (85/402)   
Checking out files:  22% (89/402)   
Checking out files:  23% (93/402)   
Checking out files:  24% (97/402)   
Checking out files:  25% (101/402)   
Checking out files:  26% (105/402)   
Checking out files:  27% (109/402)   
Checking out files:  28% (113/402)   
Checking out files:  29% (117/402)   
Checking out files:  30% (121/402)   
Checking out files:  31% (125/402)   
Checking out files:  32% (129/402)   
Checking out files:  33% (133/402)   
Checking out files:  34% (137/402)   
Checking out files:  35% (141/402)   
Checking out files:  36% (145/402)   
Checking out files:  37% (149/402)   
Checking out files:  38% (153/402)   
Checking out files:  39% (157/402)   
Checking out files:  40% (161/402)   
Checking out files:  41% (165/402)   
Checking out files:  42% (169/402)   
Checking out files:  43% (173/402)   
Checking out files:  44% (177/402)   
Checking out files:  45% (181/402)   
Checking out files:  46% (185/402)   
Checking out files:  47% (189/402)   
Checking out files:  48% (193/402)   
Checking out files:  48% (195/402)   
Checking out files:  49% (197/402)   
Checking out files:  50% (201/402)   
Checking out files:  51% (206/402)   
Checking out files:  52% (210/402)   
Checking out files:  53% (214/402)   
Checking out files:  54% (218/402)   
Checking out files:  55% (222/402)   
Checking out files:  56% (226/402)   
Checking out files:  57% (230/402)   
Checking out files:  58% (234/402)   
Checking out files:  59% (238/402)   
Checking out files:  60% (242/402)   
Checking out files:  61% (246/402)   
Checking out files:  62% (250/402)   
Checking out files:  63% (254/402)   
Checking out files:  64% (258/402)   
Checking out files:  65% (262/402)   
Checking out files:  66% (266/402)   
Checking out files:  67% (270/402)   
Checking out files:  68% (274/402)   
Checking out files:  69% (278/402)   
Checking out files:  70% (282/402)   
Checking out files:  71% (286/402)   
Checking out files:  72% (290/402)   
Checking out files:  73% (294/402)   
Checking out files:  74% (298/402)   
Checking out files:  75% (302/402)   
Checking out files:  76% (306/402)   
Checking out files:  77% (310/402)   
Checking out files:  78% (314/402)   
Checking out files:  79% (318/402)   
Checking out files:  80% (322/402)   
Checking out files:  81% (326/402)   
Checking out files:  82% (330/402)   
Checking out files:  82% (333/402)   
Checking out files:  83% (334/402)   
Checking out files:  84% (338/402)   
Checking out files:  85% (342/402)   
Checking out files:  86% (346/402)   
Checking out files:  87% (350/402)   
Checking out files:  88% (354/402)   
Checking out files:  89% (358/402)   
Checking out files:  90% (362/402)   
Checking out files:  91% (366/402)   
Checking out files:  92% (370/402)   
Checking out files:  93% (374/402)   
Checking out files:  94% (378/402)   
Checking out files:  95% (382/402)   
Checking out files:  96% (386/402)   
Checking out files:  97% (390/402)   
Checking out files:  98% (394/402)   
Checking out files:  99% (398/402)   
Checking out files: 100% (402/402)   
Checking out files: 100% (402/402), done.
Switched to branch "2.6.25-rc9-mc7"
Already on "2.6.25-rc9-mc7"
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:19: space before tab in indent.
 	unsigned authenticated:1;
warning: 1 line adds whitespace errors.
.dotest/patch:14: space before tab in indent.
 		/*
.dotest/patch:15: space before tab in indent.
 		 * If device is WUSB, we already assigned an
.dotest/patch:16: space before tab in indent.
 		 * unauthorized address in the Connect Ack sequence;
.dotest/patch:17: space before tab in indent.
 		 * authorization will assign the final address.
.dotest/patch:18: space before tab in indent.
 		 */
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
.dotest/patch: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.
.dotest/patch:345: space before tab in indent.
       		mct_u232_set_modem_ctrl(serial, priv->control_state);
warning: 1 line adds whitespace errors.
Switched to branch "2.6.25-rc9-mc7"
Already on "2.6.25-rc9-mc7"
Switched to branch "gregkh-ldp"
.dotest/patch:4822: space before tab in indent.
 	const struct firmware *fw;
.dotest/patch:5182: space before tab in indent.
 	const struct firmware *fw;
.dotest/patch:7364: space before tab in indent.
    				"Dropping\n", untd_hdr->reserved1);
.dotest/patch:8660: space before tab in indent.
 	/*
.dotest/patch:14172: space before tab in indent.
 	whcrc->umc_dev = umc_dev;
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
.dotest/patch:1896: space before tab in indent.
				 					0xd3),
.dotest/patch:1911: space before tab in indent.
				  			GO7007_SENSOR_TV) &&
.dotest/patch:1915: space before tab in indent.
				  			GO7007_SENSOR_TV) &&
.dotest/patch:2125: space before tab in indent.
		 			(1 << 14) | (1 << 9) : 0) |
.dotest/patch:2128: space before tab in indent.
			 	GO7007_SENSOR_CONFIG_MASK),
warning: 5 lines add whitespace errors.
.dotest/patch:58: trailing whitespace.
obj-$(CONFIG_SLICOSS) += slicoss.o
.dotest/patch:24450: space before tab in indent.
 	ushort		DramRomFn;		// 14 Dram/Rom function
warning: 2 lines add whitespace errors.
Checking out files:   5% (28/509)   
Checking out files:   6% (31/509)   
Checking out files:   7% (36/509)   
Checking out files:   8% (41/509)   
Checking out files:   9% (46/509)   
Checking out files:  10% (51/509)   
Checking out files:  11% (56/509)   
Checking out files:  12% (62/509)   
Checking out files:  13% (67/509)   
Checking out files:  14% (72/509)   
Checking out files:  15% (77/509)   
Checking out files:  16% (82/509)   
Checking out files:  17% (87/509)   
Checking out files:  18% (92/509)   
Checking out files:  19% (97/509)   
Checking out files:  20% (102/509)   
Checking out files:  21% (107/509)   
Checking out files:  22% (112/509)   
Checking out files:  23% (118/509)   
Checking out files:  24% (123/509)   
Checking out files:  25% (128/509)   
Checking out files:  26% (133/509)   
Checking out files:  27% (138/509)   
Checking out files:  28% (143/509)   
Checking out files:  29% (148/509)   
Checking out files:  30% (153/509)   
Checking out files:  31% (158/509)   
Checking out files:  32% (163/509)   
Checking out files:  33% (168/509)   
Checking out files:  34% (174/509)   
Checking out files:  35% (179/509)   
Checking out files:  36% (184/509)   
Checking out files:  37% (189/509)   
Checking out files:  38% (194/509)   
Checking out files:  39% (199/509)   
Checking out files:  40% (204/509)   
Checking out files:  41% (209/509)   
Checking out files:  42% (214/509)   
Checking out files:  43% (219/509)   
Checking out files:  44% (224/509)   
Checking out files:  45% (230/509)   
Checking out files:  46% (235/509)   
Checking out files:  47% (240/509)   
Checking out files:  48% (245/509)   
Checking out files:  49% (250/509)   
Checking out files:  50% (255/509)   
Checking out files:  51% (260/509)   
Checking out files:  52% (265/509)   
Checking out files:  53% (270/509)   
Checking out files:  54% (275/509)   
Checking out files:  55% (280/509)   
Checking out files:  56% (286/509)   
Checking out files:  57% (291/509)   
Checking out files:  58% (296/509)   
Checking out files:  59% (301/509)   
Checking out files:  60% (306/509)   
Checking out files:  61% (311/509)   
Checking out files:  62% (316/509)   
Checking out files:  63% (321/509)   
Checking out files:  64% (326/509)   
Checking out files:  65% (331/509)   
Checking out files:  66% (336/509)   
Checking out files:  67% (342/509)   
Checking out files:  68% (347/509)   
Checking out files:  69% (352/509)   
Checking out files:  70% (357/509)   
Checking out files:  71% (362/509)   
Checking out files:  72% (367/509)   
Checking out files:  73% (372/509)   
Checking out files:  74% (377/509)   
Checking out files:  75% (382/509)   
Checking out files:  76% (387/509)   
Checking out files:  77% (392/509)   
Checking out files:  78% (398/509)   
Checking out files:  79% (403/509)   
Checking out files:  80% (408/509)   
Checking out files:  81% (413/509)   
Checking out files:  82% (418/509)   
Checking out files:  83% (423/509)   
Checking out files:  84% (428/509)   
Checking out files:  85% (433/509)   
Checking out files:  86% (438/509)   
Checking out files:  87% (443/509)   
Checking out files:  88% (448/509)   
Checking out files:  89% (454/509)   
Checking out files:  90% (459/509)   
Checking out files:  91% (464/509)   
Checking out files:  92% (469/509)   
Checking out files:  93% (474/509)   
Checking out files:  94% (479/509)   
Checking out files:  95% (484/509)   
Checking out files:  96% (489/509)   
Checking out files:  97% (494/509)   
Checking out files:  98% (499/509)   
Checking out files:  99% (504/509)   
Checking out files: 100% (509/509)   
Checking out files: 100% (509/509), done.
Switched to branch "2.6.25-rc9-mc7"
error: branch 'agp' not found.
remote: Counting objects: 43, done.
remote: Compressing objects:   3% (1/31)   
remote: Compressing objects:   6% (2/31)   
remote: Compressing objects:   9% (3/31)   
remote: Compressing objects:  12% (4/31)   
remote: Compressing objects:  16% (5/31)   
remote: Compressing objects:  19% (6/31)   
remote: Compressing objects:remote:   22% (7/31)   
remote: Compressing objects:  25% (8/31)   
remote: Compressing objects:  29% (9/31)   
remote: Compressing objects:  32% (10/31)   
remote: Comremote: pressing objects:  35% (11/31)   
remote: Compressing objects:  38% (12/31)   
remote: Compressing objects:  41% (13/31)   
remote: Compressing objects:remote:   45% (14/31)   
remote: Compressing objects:  48% (15/31)   
remote: Compressing objects:  51% (16/31)   
remote: Compressing objects:  54% (17/31)   
remote: Compressing objects:  58% (18/31)   
remote: Compressing objects:  61% (19/31)   
remote: Compressing objects:  64% (20/31)   
remote: Compressing objecremote: ts:  67% (21/31)   
remote: Compressing objects:  70% (22/31)   
remote: Compressing objects:  74% (23/31)   
remote: Compressing objects:  77% (24/31) remote:   
remote: Compressing objects:  80% (25/31)   
remote: Compressing objects:  83% (26/31)   
remote: Compressing objects:  87% (27/31)   
remote: Compressing obremote: jects:  90% (28/31)   
remote: Compressing objects:  93% (29/31)   
remote: Compressing objects:  96% (30/31)   
remote: Compressing objects: 100% (31/3remote: 1)   
remote: Compressing objects: 100% (31/31), done.
remote: Total 31 (delta 25), reused 0 (delta 0)
From /pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
   1be8010..7011c5f  avr32-arch -> avr32
remote: Counting objects: 1   
remote: Counting objects: 27, done.
remote: Compressing objects:   6% (1/16)   
remote: Compressing objects:  12% (2/16)   
remote: Compressing objects:  18% (3/16)   
remote: Compressing objects:remote:   25% (4/16)   
remote: Compressing objects:  31% (5/16)   
remote: Compressing objects:  37% (6/16)   
remote: Compressing objects:  43% (7/16)   
remote: Compremote: ressing objects:  50% (8/16)   
remote: Compressing objects:  56% (9/16)   
remote: Compressing objects:  62% (10/16)   
remote: Compressing objects:  6remote: 8% (11/16)   
remote: Compressing objects:  75% (12/16)   
remote: Compressing objects:  81% (13/16)   
remote: Compressing objects:  87% (14/16)   
remote: Comremote: pressing objects:  93% (15/16)   
remote: Compressing objects: 100% (16/16)   
remote: Compressing objects: 100% (16/16), done.
remote: Total 16 (delta 13), reused 0 (delta 0)
From /pub/scm/linux/kernel/git/sfrench/cifs-2.6
   cce246e..8d14213  master     -> cifs
remote: Counting objects: 190, done.
remote: Compressing objects:   3% (1/31)   
remote: Compressing objects:   6% (2/31)   
remote: Compressing objects:   9% (3/31)   
remote: Compressing objects:  12% (4/31)   
remote: Compressing objects:  16% (5/31)   
remote: Compressing objects:  19% (6/31)   
remote: Compressing objects:  22% (7/31)   
remote: Compressing objects:  25% (8/31)   
remote: Compressing objects:  29% (9/31)   
remote: Compressing objects:  32% (10/31)   
remote: Compressing objects:  35% (11/31)   
remote: Compressing objects:  38% (12/31)   
remote: Compressing objects:  41% (13/31)   
remote: Compressing objects:  45% (14/31)   
remote: Compressing objects:  48% (15/31)   
remote: Compressing objecremote: ts:  51% (16/31)   
remote: Compressing objects:  54% (17/31)   
remote: Compressing objects:  58% (18/31)   
remote: Compressing objects:  61% (19/31) remote:   
remote: Compressing objects:  64% (20/31)   
remote: Compressing objects:  67% (21/31)   
remote: Compressing objects:  70% (22/31)   
remote: Compressing obremote: jects:  74% (23/31)   
remote: Compressing objects:  77% (24/31)   
remote: Compressing objects:  80% (25/31)   
remote: Compressing objects:  83% (26/3remote: 1)   
remote: Compressing objects:  87% (27/31)   
remote: Compressing objects:  90% (28/31)   
remote: Compressing objects:  93% (29/31)   
remote: Compressingremote:  objects:  96% (30/31)   
remote: Compressing objects: 100% (31/31)   
remote: Compressing objects: 100% (31/31), done.
remote: Total 143 (delta 126), reused 129 (delta 112)
Receiving objects:   0% (1/143)   
Receiving objects:   1% (2/143)   
Receiving objects:   2% (3/143)   
Receiving objects:   3% (5/143)   
Receiving objects:   4% (6/143)   
Receiving objects:   5% (8/143)   
Receiving objects:   6% (9/143)   
Receiving objects:   7% (11/143)   
Receiving objects:   8% (12/143)   
Receiving objects:   9% (13/143)   
Receiving objects:  10% (15/143)   
Receiving objects:  11% (16/143)   
Receiving objects:  12% (18/143)   
Receiving objects:  13% (19/143)   
Receiving objects:  14% (21/143)   
Receiving objects:  15% (22/143)   
Receiving objects:  16% (23/143)   
Receiving objects:  17% (25/143)   
Receiving objects:  18% (26/143)   
Receiving objects:  19% (28/143)   
Receiving objects:  20% (29/143)   
Receiving objects:  21% (31/143)   
Receiving objects:  22% (32/143)   
Receiving objects:  23% (33/143)   
Receiving objects:  24% (35/143)   
Receiving objects:  25% (36/143)   
Receiving objects:  26% (38/143)   
Receiving objects:  27% (39/143)   
Receiving objects:  28% (41/143)   
Receiving objects:  29% (42/143)   
Receiving objects:  30% (43/143)   
Receiving objects:  31% (45/143)   
Receiving objects:  32% (46/143)   
Receiving objects:  33% (48/143)   
Receiving objects:  34% (49/143)   
Receiving objects:  35% (51/143)   
Receiving objects:  36% (52/143)   
Receiving objects:  37% (53/143)   
Receiving objects:  38% (55/143)   
Receiving objects:  39% (56/143)   
Receiving objects:  40% (58/143)   
Receiving objects:  41% (59/143)   
Receiving objects:  42% (61/143)   
Receiving objects:  43% (62/143)   
Receiving objects:  44% (63/143)   
Receiving objects:  45% (65/143)   
Receiving objects:  46% (66/143)   
Receiving objects:  47% (68/143)   
Receiving objects:  48% (69/143)   
Receiving objects:  49% (71/143)   
Receiving objects:  50% (72/143)   
Receiving objects:  51% (73/143)   
Receiving objects:  52% (75/143)   
Receiving objects:  53% (76/143)   
Receiving objects:  54% (78/143)   
Receiving objects:  55% (79/143)   
Receiving objects:  56% (81/143)   
Receiving objects:  57% (82/143)   
Receiving objects:  58% (83/143)   
Receiving objects:  59% (85/143)   
Receiving objects:  60% (86/143)   
Receiving objects:  61% (88/143)   
Receiving objects:  62% (89/143)   
Receiving objects:  63% (91/143)   
Receiving objects:  64% (92/143)   
Receiving objects:  65% (93/143)   
Receiving objects:  66% (95/143)   
Receiving objects:  67% (96/143)   
Receiving objects:  68% (98/143)   
Receiving objects:  69% (99/143)   
Receiving objects:  70% (101/143)   
Receiving objects:  71% (102/143)   
Receiving objects:  72% (103/143)   
Receiving objects:  73% (105/143)   
Receiving objects:  74% (106/143)   
Receiving objects:  75% (108/143)   
Receiving objects:  76% (109/143)   
Receiving objects:  77% (111/143)   
Receiving objects:  78% (112/143)   
Receiving objects:  79% (113/143)   
Receiving objects:  80% (115/143)   
Receiving objects:  81% (116/143)   
Receiving objects:  82% (118/143)   
Receiving objects:  83% (119/143)   
Receiving objects:  84% (121/143)   
Receiving objects:  85% (122/143)   
Receiving objects:  86% (123/143)   
Receiving objects:  87% (125/143)   
Receiving objects:  88% (126/143)   
Receiving objects:  89% (128/143)   
Receiving objects:  90% (129/143)   
Receiving objects:  91% (131/143)   
Receiving objects:  92% (132/143)   
Receiving objects:  93% (133/143)   
Receiving objects:  94% (135/143)   
Receiving objects:  95% (136/143)   
Receiving objects:  96% (138/143)   
Receiving objects:  97% (139/143)   
Receiving objects:  98% (141/143)   
Receiving objects:  99% (142/143)   
Receiving objects: 100% (143/143)   
Receiving objects: 100% (143/143), 24.60 KiB, done.
Resolving deltas:  13% (17/126)   
Resolving deltas:  14% (18/126)   
Resolving deltas:  15% (19/126)   
Resolving deltas:  24% (31/126)   
Resolving deltas:  33% (42/126)   
Resolving deltas:  34% (43/126)   
Resolving deltas:  39% (50/126)   
Resolving deltas:  40% (51/126)   
Resolving deltas:  44% (56/126)   
Resolving deltas:  48% (61/126)   
Resolving deltas:  49% (62/126)   
Resolving deltas:  50% (63/126)   
Resolving deltas:  51% (65/126)   
Resolving deltas:  52% (66/126)   
Resolving deltas:  53% (68/126)   
Resolving deltas:  54% (69/126)   
Resolving deltas:  55% (70/126)   
Resolving deltas:  58% (74/126)   
Resolving deltas:  59% (75/126)   
Resolving deltas:  60% (76/126)   
Resolving deltas:  62% (79/126)   
Resolving deltas:  63% (80/126)   
Resolving deltas:  64% (81/126)   
Resolving deltas:  66% (84/126)   
Resolving deltas:  67% (85/126)   
Resolving deltas:  69% (88/126)   
Resolving deltas:  70% (89/126)   
Resolving deltas:  71% (90/126)   
Resolving deltas:  73% (93/126)   
Resolving deltas:  76% (96/126)   
Resolving deltas:  77% (98/126)   
Resolving deltas:  78% (99/126)   
Resolving deltas:  79% (100/126)   
Resolving deltas:  80% (101/126)   
Resolving deltas:  84% (107/126)   
Resolving deltas:  88% (112/126)   
Resolving deltas:  91% (115/126)   
Resolving deltas:  92% (116/126)   
Resolving deltas:  93% (118/126)   
Resolving deltas:  94% (119/126)   
Resolving deltas:  95% (120/126)   
Resolving deltas:  97% (123/126)   
Resolving deltas: 100% (126/126)   
Resolving deltas: 100% (126/126), completed with 47 local objects.
From /pub/scm/linux/kernel/git/paulus/powerpc
   320787c..d9024df  master     -> powerpc
remote: Counting objects: 3315, done.
remote: Compressing objects:   0% (1/663)   
remote: Compressing objects:   1% (7/663)   
remote: Compressing objects:   2% (14/663)   
remote: Compressing objects:   3% (20/663)   
remote: Compressing objects:   4% (27/663)   
remote: Compressing objects:   5% (34/663)   
remote: Compressing objects:   6% (40/663)   
remote: Compressing objects:   7% (47/663)   
remote: Compressing objects:   8% (54/663)   
remote: Compressing objects:   9% (60/663)   
remote: Compressing objects:  10% (67/663)   
remote: Compressing objects:  11% (73/663)   
remote: Compressing objects:  12% (80/663)   
remote: Compressing objects:  13% (87/663)   
remote: Compressing objects:  14% (93/663)   
remote: Compressing objects:  15% (100/663)   
remote: Compressing objects:  16% (107/663)   
remote: Compressing objects:  17% (113/663)   
remote: Compressing objects:  18% (120/663)   
remote: Compressing objects:  19% (126/663)   
remote: Compressing objects:  20% (133/663)   
remote: Compressing objects:  21% (140/663)   
remote: Compressing objects:  22% (146/663)   
remote: Compressing objects:  23% (153/663)   
remote: Compressing objects:  24% (160/663)   
remote: Compressing objects:  25% (166/663)   
remote: Compressing objects:  26% (173/663)   
remote: Compressing objects:  27% (180/663)   
remote: Compressing objects:  28% (186/663)   
remote: Compressing objects:  29% (193/663)   
remote: Compressing objects:  30% (199/663)   
remote: Compressing objects:  31% (206/663)   
remote: Compressing objects:  32% (213/663)   
remote: Compressing objects:  33% (219/663)   
remote: Compressing objects:  34% (226/663)   
remote: Compressing objects:  35% (233/663)   
remote: Compressing objects:  36% (239/663)   
remote: Compressing objects:  37% (246/663)   
remote: Compressing objects:  38% (252/663)   
remote: Compressing objects:  39% (259/663)   
remote: Compressing objects:  40% (266/663)   
remote: Compressing objects:  41% (272/663)   
remote: Compressing objects:  42% (279/663)   
remote: Compressing objects:  43% (286/663)   
remote: Compressing objects:  44% (292/663)   
remote: Compressing objects:  45% (299/663)   
remote: Compressing objects:  46% (305/663)   
remote: Compressing objects:  47% (312/663)   
remote: Compressing objects:  48% (319/663)   
remote: Compressing objects:  49% (325/663)   
remote: Compressing objects:  50% (332/663)   
remote: Compressing objects:  51% (339/663)   
remote: Compressing objects:  52% (345/663)   
remote: Compressing objects:  53% (352/663)   
remote: Compressing objects:  54% (359/663)   
remote: Compressing objects:  55% (365/663)   
remote: Compressing objects:  56% (372/663)   
remote: Compressing objects:  57% (378/663)   
remote: Compressing objects:  58% (385/663)   
remote: Compressing objects:  59% (392/663)   
remote: Compressing objects:  60% (398/663)   
remote: Compressing objects:  61% (405/663)   
remote: Compressing objects:  62% (412/663)   
remote: Compressing objects:  63% (418/663)   
remote: Compressing objects:  64% (425/663)   
remote: Compressing objects:  65% (431/663)   
remote: Compressing objects:  66% (438/663)   
remote: Compressing objects:  67% (445/663)   
remote: Compressing objects:  68% (451/663)   
remote: Compressing objects:  69% (458/663)   
remote: Compressing objects:  70% (465/663)   
remote: Compressing objects:  71% (471/663)   
remote: Compressing objects:  72% (478/663)   
remote: Compressing objects:  73% (484/663)   
remote: Compressing objects:  74% (491/663)   
remote: Compressing objects:  75% (498/663)   
remote: Compressing objects:  76% (504/663)   
remote: Compressing objects:  77% (511/663)   
remote: Compressing objects:  78% (518/663)   
remote: Compressing objects:  79% (524/663)   
remote: Compressing objects:  80% (531/663)   
remote: Compressing objects:  81% (538/663)   
remote: Compressing objects:  82% (544/663)   
remote: Compressing objects:  83% (551/663)   
remote: Compressing objects:  84% (557/663)   
remote: Compressing objects:  85% (564/663)   
remote: Compressing objects:  86% (571/663)   
remote: Compressing objects:  87% (577/663)   
remote: Compressing objects:  88% (584/663)   
remote: Compressing objects:  89% (591/663)   
remote: Compressing objects:  90% (597/663)   
remote: Compressing objects:  91% (604/663)   
remote: Compressing objects:  92% (610/663)   
remote: Compressing objects:  93% (617/663)   
remote: Compressing objects:  94% (624/663)   
remote: Compressing objects:  95% (630/663)   
remote: Compressing objects:  96% (637/663)   
remote: Compressing objects:  97% (644/663)   
remote: Compressing objects:  98% (650/663)   
remote: Compressing objects:  99% (657/663)   
remote: Compressing objects: 100% (663/663)   
remote: Compressing objects: 100% (663/663), done.
Receiving objects:   0% (1/2906)   
Receiving objects:   1% (30/2906)   
Receiving objects:   2% (59/2906)   
Receiving objects:   3% (88/2906)   
Receiving objects:   4% (117/2906)   
Receiving objects:   5% (146/2906)   
Receiving objects:   6% (175/2906)   
Receiving objects:   7% (204/2906)   
Receiving objects:   8% (233/2906)   
Receiving objects:   9% (262/2906)   
Receiving objects:  10% (291/2906)   
Receiving objects:  11% (320/2906)   
Receiving objects:  12% (349/2906)   
Receiving objects:  13% (378/2906)   
Receiving objects:  14% (407/2906)   
Receiving objects:  15% (436/2906)   
Receiving objects:  16% (465/2906)   
Receiving objects:  17% (495/2906)   
Receiving objects:  18% (524/2906)   
Receiving objects:  19% (553/2906)   
Receiving objects:  20% (582/2906)   
Receiving objects:  21% (611/2906)   
Receiving objects:  22% (640/2906)   
Receiving objects:  23% (669/2906)   
Receiving objects:  24% (698/2906)   
Receiving objects:  25% (727/2906)   
Receiving objects:  26% (756/2906)   
Receiving objects:  27% (785/2906)   
Receiving objects:  28% (814/2906)   
Receiving objects:  29% (843/2906)   
Receiving objects:  30% (872/2906)   
Receiving objects:  31% (901/2906)   
Receiving objects:  32% (930/2906)   
Receiving objects:  33% (959/2906)   
Receiving objects:  34% (989/2906)   
Receiving objects:  35% (1018/2906)   
Receiving objects:  36% (1047/2906)   
Receiving objects:  37% (1076/2906)   
Receiving objects:  38% (1105/2906)   
Receiving objects:  39% (1134/2906)   
Receiving objects:  40% (1163/2906)   
Receiving objects:  41% (1192/2906)   
Receiving objects:  42% (1221/2906)   
Receiving objects:  43% (1250/2906)   
Receiving objects:  44% (1279/2906)   
Receiving objects:  45% (1308/2906)   
Receiving objects:  46% (1337/2906)   
Receiving objects:  47% (1366/2906)   
Receiving objects:  48% (1395/2906)   
Receiving objects:  49% (1424/2906)   
Receiving objects:  50% (1453/2906)   
Receiving objects:  51% (1483/2906)   
Receiving objects:  52% (1512/2906)   
remote: Total 2906 (delta 2597), reused 2550 (delta 2243)
Receiving objects:  53% (1541/2906)   
Receiving objects:  54% (1570/2906)   
Receiving objects:  55% (1599/2906)   
Receiving objects:  56% (1628/2906)   
Receiving objects:  57% (1657/2906)   
Receiving objects:  58% (1686/2906)   
Receiving objects:  59% (1715/2906)   
Receiving objects:  60% (1744/2906)   
Receiving objects:  61% (1773/2906)   
Receiving objects:  62% (1802/2906)   
Receiving objects:  63% (1831/2906)   
Receiving objects:  64% (1860/2906)   
Receiving objects:  65% (1889/2906)   
Receiving objects:  66% (1918/2906)   
Receiving objects:  67% (1948/2906)   
Receiving objects:  68% (1977/2906)   
Receiving objects:  69% (2006/2906)   
Receiving objects:  70% (2035/2906)   
Receiving objects:  71% (2064/2906)   
Receiving objects:  72% (2093/2906)   
Receiving objects:  73% (2122/2906)   
Receiving objects:  74% (2151/2906)   
Receiving objects:  75% (2180/2906)   
Receiving objects:  76% (2209/2906)   
Receiving objects:  77% (2238/2906)   
Receiving objects:  78% (2267/2906)   
Receiving objects:  79% (2296/2906)   
Receiving objects:  80% (2325/2906)   
Receiving objects:  81% (2354/2906)   
Receiving objects:  82% (2383/2906)   
Receiving objects:  83% (2412/2906)   
Receiving objects:  84% (2442/2906)   
Receiving objects:  85% (2471/2906)   
Receiving objects:  86% (2500/2906)   
Receiving objects:  87% (2529/2906)   
Receiving objects:  88% (2558/2906)   
Receiving objects:  89% (2587/2906)   
Receiving objects:  90% (2616/2906)   
Receiving objects:  91% (2645/2906)   
Receiving objects:  92% (2674/2906)   
Receiving objects:  93% (2703/2906)   
Receiving objects:  94% (2732/2906)   
Receiving objects:  95% (2761/2906)   
Receiving objects:  96% (2790/2906)   
Receiving objects:  97% (2819/2906)   
Receiving objects:  98% (2848/2906)   
Receiving objects:  99% (2877/2906)   
Receiving objects: 100% (2906/2906)   
Receiving objects: 100% (2906/2906), 456.63 KiB, done.
Resolving deltas:   0% (17/2597)   
Resolving deltas:   1% (28/2597)   
Resolving deltas:   7% (205/2597)   
Resolving deltas:   8% (210/2597)   
Resolving deltas:   9% (239/2597)   
Resolving deltas:  10% (276/2597)   
Resolving deltas:  12% (324/2597)   
Resolving deltas:  13% (345/2597)   
Resolving deltas:  15% (391/2597)   
Resolving deltas:  18% (470/2597)   
Resolving deltas:  26% (683/2597)   
Resolving deltas:  30% (794/2597)   
Resolving deltas:  31% (828/2597)   
Resolving deltas:  44% (1149/2597)   
Resolving deltas:  45% (1179/2597)   
Resolving deltas:  58% (1509/2597)   
Resolving deltas:  59% (1534/2597)   
Resolving deltas:  60% (1563/2597)   
Resolving deltas:  61% (1588/2597)   
Resolving deltas:  62% (1614/2597)   
Resolving deltas:  63% (1639/2597)   
Resolving deltas:  64% (1674/2597)   
Resolving deltas:  65% (1689/2597)   
Resolving deltas:  66% (1716/2597)   
Resolving deltas:  67% (1740/2597)   
Resolving deltas:  68% (1767/2597)   
Resolving deltas:  69% (1793/2597)   
Resolving deltas:  70% (1819/2597)   
Resolving deltas:  71% (1846/2597)   
Resolving deltas:  72% (1870/2597)   
Resolving deltas:  73% (1896/2597)   
Resolving deltas:  75% (1949/2597)   
Resolving deltas:  76% (1974/2597)   
Resolving deltas:  77% (2000/2597)   
Resolving deltas:  78% (2026/2597)   
Resolving deltas:  79% (2054/2597)   
Resolving deltas:  80% (2086/2597)   
Resolving deltas:  81% (2105/2597)   
Resolving deltas:  82% (2152/2597)   
Resolving deltas:  83% (2157/2597)   
Resolving deltas:  84% (2196/2597)   
Resolving deltas:  85% (2209/2597)   
Resolving deltas:  86% (2243/2597)   
Resolving deltas:  87% (2268/2597)   
Resolving deltas:  88% (2288/2597)   
Resolving deltas:  89% (2312/2597)   
Resolving deltas:  90% (2350/2597)   
Resolving deltas:  91% (2369/2597)   
Resolving deltas:  92% (2392/2597)   
Resolving deltas:  93% (2416/2597)   
Resolving deltas:  94% (2445/2597)   
Resolving deltas:  95% (2469/2597)   
Resolving deltas:  96% (2496/2597)   
Resolving deltas:  97% (2530/2597)   
Resolving deltas:  98% (2552/2597)   
Resolving deltas:  99% (2589/2597)   
Resolving deltas: 100% (2597/2597)   
Resolving deltas: 100% (2597/2597), completed with 361 local objects.
From /pub/scm/linux/kernel/git/mchehab/v4l-dvb
 + 46c0de2...7bad8ed devel      -> dvb  (forced update)
fatal: Not a valid object name: '2.6.25-rc9'.
Switched to branch "i2c"
Checking out files:  47% (698/1485)   
Checking out files:  48% (713/1485)   
Checking out files:  49% (728/1485)   
Checking out files:  50% (743/1485)   
Checking out files:  51% (758/1485)   
Checking out files:  52% (773/1485)   
Checking out files:  53% (788/1485)   
Checking out files:  54% (802/1485)   
Checking out files:  55% (817/1485)   
Checking out files:  56% (832/1485)   
Checking out files:  57% (847/1485)   
Checking out files:  58% (862/1485)   
Checking out files:  59% (877/1485)   
Checking out files:  60% (891/1485)   
Checking out files:  61% (906/1485)   
Checking out files:  62% (921/1485)   
Checking out files:  63% (936/1485)   
Checking out files:  64% (951/1485)   
Checking out files:  65% (966/1485)   
Checking out files:  66% (981/1485)   
Checking out files:  67% (995/1485)   
Checking out files:  68% (1010/1485)   
Checking out files:  69% (1025/1485)   
Checking out files:  70% (1040/1485)   
Checking out files:  71% (1055/1485)   
Checking out files:  72% (1070/1485)   
Checking out files:  73% (1085/1485)   
Checking out files:  74% (1099/1485)   
Checking out files:  75% (1114/1485)   
Checking out files:  76% (1129/1485)   
Checking out files:  77% (1144/1485)   
Checking out files:  78% (1159/1485)   
Checking out files:  79% (1174/1485)   
Checking out files:  80% (1188/1485)   
Checking out files:  81% (1203/1485)   
Checking out files:  82% (1218/1485)   
Checking out files:  83% (1233/1485)   
Checking out files:  84% (1248/1485)   
Checking out files:  85% (1263/1485)   
Checking out files:  86% (1278/1485)   
Checking out files:  87% (1292/1485)   
Checking out files:  88% (1307/1485)   
Checking out files:  89% (1322/1485)   
Checking out files:  90% (1337/1485)   
Checking out files:  91% (1352/1485)   
Checking out files:  92% (1367/1485)   
Checking out files:  93% (1382/1485)   
Checking out files:  94% (1396/1485)   
Checking out files:  95% (1411/1485)   
Checking out files:  96% (1426/1485)   
Checking out files:  97% (1441/1485)   
Checking out files:  98% (1456/1485)   
Checking out files:  99% (1471/1485)   
Checking out files: 100% (1485/1485)   
Checking out files: 100% (1485/1485), done.
Switched to branch "2.6.25-rc9-mc7"
Already on "2.6.25-rc9-mc7"
remote: Counting objects: 105, done.
remote: Compressing objects:   3% (1/27)   
remote: Compressing objects:   7% (2/27)   
remote: Compressing objects:  11% (remote: 3/27)   
remote: Compressing objects:  14% (4/27)   
remote: Compressing objects:  18% (5/27)   
remote: Compressing objects:  22% (6/27)   
remote: Compressingremote:  objects:  25% (7/27)   
remote: Compressing objects:  29% (8/27)   
remote: Compressing objects:  33% (9/27)   
remote: Compressing objects:  37% (10/2remote: 7)   
remote: Compressing objects:  40% (11/27)   
remote: Compressing objects:  44% (12/27)   
remote: Compressing objects:  48% (13/27)   
remote: Compressingremote:  objects:  51% (14/27)   
remote: Compressing objects:  55% (15/27)   
remote: Compressing objects:  59% (16/27)   
remote: Compressing objects:  62% (1remote: 7/27)   
remote: Compressing objects:  66% (18/27)   
remote: Compressing objects:  70% (19/27)   
remote: Compressing objects:  74% (20/27)   
remote: Compressremote: ing objects:  77% (21/27)   
remote: Compressing objects:  81% (22/27)   
remote: Compressing objects:  85% (23/27)   
remote: Compressing objects:  88%remote:  (24/27)   
remote: Compressing objects:  92% (25/27)   
remote: Compressing objects:  96% (26/27)   
remote: Compressing objects: 100% (27/27)   
remote: Comprremote: essing objects: 100% (27/27), done.
remote: Total 88 (delta 74), reused 75 (delta 61)
From /pub/scm/linux/kernel/git/jikos/hid
 + e763c0d...bcd7894 upstream   -> hid-upstream  (forced update)
remote: Counting objects: 1   
remote: Counting objects: 15, done.
remote: Compressing objects:  14% (1/7)   
remote: Compressing objects:  28% (2/7)   
remote: Compressing objects:  42% (3/7)   
remote: Compressing objects:  57% (4/7)   
remote: Compressing objects:  71% (5/7)   
remote: Compressing objects:  85% (6/7)   
remote: Compressing objects: 100% (7/7)   
remote: Compressing objects: 100% (7/7), done.
remote: Total 9 (delta 7), reused 3 (delta 2)
From /pub/scm/linux/kernel/git/axboe/linux-2.6-block
   4faa3c8..75ce6fa  for-linus  -> block-for-linus
remote: Counting objects: 144, done.
remote: Compressing objects:   5% (1/19)   
remote: Compressing objects:  10% (2/19)   
remote: Compressing objects:  15% (remote: 3/19)   
remote: Compressing objects:  21% (4/19)   
remote: Compressing objects:  26% (5/19)   
remote: Compressing objects:  31% (6/19)   
remote: Compressingremote:  objects:  36% (7/19)   
remote: Compressing objects:  42% (8/19)   
remote: Compressing objects:  47% (9/19)   
remote: Compressing objects:  52% (10/1remote: 9)   
remote: Compressing objects:  57% (11/19)   
remote: Compressing objects:  63% (12/19)   
remote: Compressing objects:  68% (13/19)   
remote: Compressingremote:  objects:  73% (14/19)   
remote: Compressing objects:  78% (15/19)   
remote: Compressing objects:  84% (16/19)   
remote: Compressing objects:  89% (1remote: 7/19)   
Receiving objects:   0% (1/108)   
Receiving objects:   1% (2/108)   
Receiving objects:   2% (3/108)   
Receiving objects:   3% (4/108)   
Receiving objects:   4% (5/108)   
Receiving objects:   5% (6/108)   
Receiving objects:   6% (7/108)   
Receiving objects:   7% (8/108)   
Receiving objects:   8% (9/108)   
Receiving objects:   9% (10/108)   
Receiving objects:  10% (11/108)   
Receiving objects:  11% (12/108)   
Receiving objects:  12% (13/108)   
Receiving objects:  13% (15/108)   
Receiving objects:  14% (16/108)   
Receiving objects:  15% (17/108)   
Receiving objects:  16% (18/108)   
Receiving objects:  17% (19/108)   
Receiving objects:  18% (20/108)   
Receiving objects:  19% (21/108)   
Receiving objects:  20% (22/108)   
Receiving objects:  21% (23/108)   
Receiving objects:  22% (24/108)   
Receiving objects:  23% (25/108)   
Receiving objects:  24% (26/108)   
Receiving objects:  25% (27/108)   
Receiving objects:  26% (29/108)   
Receiving objects:  27% (30/108)   
Receiving objects:  28% (31/108)   
Receiving objects:  29% (32/108)   
Receiving objects:  30% (33/108)   
Receiving objects:  31% (34/108)   
Receiving objects:  32% (35/108)   
Receiving objects:  33% (36/108)   
Receiving objects:  34% (37/108)   
Receiving objects:  35% (38/108)   
Receiving objects:  36% (39/108)   
Receiving objects:  37% (40/108)   
Receiving objects:  38% (42/108)   
Receiving objects:  39% (43/108)   
Receiving objects:  40% (44/108)   
Receiving objects:  41% (45/108)   
Receiving objects:  42% (46/108)   
Receiving objects:  43% (47/108)   
Receiving objects:  44% (48/108)   
Receiving objects:  45% (49/108)   
Receiving objects:  46% (50/108)   
Receiving objects:  47% (51/108)   
Receiving objects:  48% (52/108)   
Receiving objects:  49% (53/108)   
Receiving objects:  50% (54/108)   
Receiving objects:  51% (56/108)   
Receiving objects:  52% (57/108)   
Receiving objects:  53% (58/108)   
Receiving objects:  54% (59/108)   
Receiving objects:  55% (60/108)   
Receiving objects:  56% (61/108)   
Receiving objects:  57% (62/108)   
Receiving objects:  58% (63/108)   
Receiving objects:  59% (64/108)   
Receiving objects:  60% (65/108)   
Receiving objects:  61% (66/108)   
Receiving objects:  62% (67/108)   
Receiving objects:  63% (69/108)   
Receiving objects:  64% (70/108)   
Receiving objects:  65% (71/108)   
Receiving objects:  66% (72/108)   
Receiving objects:  67% (73/108)   
Receiving objects:  68% (74/108)   
Receiving objects:  69% (75/108)   
Receiving objects:  70% (76/108)   
Receiving objects:  71% (77/108)   
Receiving objects:  72% (78/108)   
Receiving objects:  73% (79/108)   
Receiving objects:  74% (80/108)   
Receiving objects:  75% (81/108)   
Receiving objects:  76% (83/108)   
Receiving objects:  77% (84/108)   
Receiving objects:  78% (85/108)   
Receiving objects:  79% (86/108)   
Receiving objects:  80% (87/108)   
Receiving objects:  81% (88/108)   
Receiving objects:  82% (89/108)   
Receiving objects:  83% (90/108)   
Receiving objects:  84% (91/108)   
Receiving objects:  85% (92/108)   
Receiving objects:  86% (93/108)   
Receiving objects:  87% (94/108)   
Receiving objects:  88% (96/108)   
Receiving objects:  89% (97/108)   
Receiving objects:  90% (98/108)   
Receiving objects:  91% (99/108)   
Receiving objects:  92% (100/108)   
Receiving objects:  93% (101/108)   
Receiving objects:  94% (102/108)   
Receiving objects:  95% (103/108)   
Receiving objects:  96% (104/108)   
Receiving objects:  97% (105/108)   
Receiving objects:  98% (106/108)   
Receiving objects:  99% (107/108)   
Receiving objects: 100% (108/108)   
Receiving objects: 100% (108/108), 16.31 KiB, done.
Resolving deltas:   2% (2/89)   
Resolving deltas:  17% (16/89)   
Resolving deltas:  19% (17/89)   
Resolving deltas:  20% (18/89)   
Resolving deltas:  21% (19/89)   
Resolving deltas:  26% (24/89)   
Resolving deltas:  29% (26/89)   
Resolving deltas:  31% (28/89)   
Resolving deltas:  32% (29/89)   
Resolving deltas:  33% (30/89)   
Resolving deltas:  47% (42/89)   
Resolving deltas:  50% (45/89)   
Resolving deltas:  51% (46/89)   
Resolving deltas:  52% (47/89)   
Resolving deltas:  53% (48/89)   
Resolving deltas:  61% (55/89)   
Resolving deltas:  62% (56/89)   
Resolving deltas:  64% (57/89)   
Resolving deltas:  67% (60/89)   
Resolving deltas:  69% (62/89)   
Resolving deltas:  70% (63/89)   
Resolving deltas:  71% (64/89)   
Resolving deltas:  73% (65/89)   
Resolving deltas:  74% (66/89)   
Resolving deltas:  75% (67/89)   
Resolving deltas:  76% (68/89)   
Resolving deltas:  78% (70/89)   
Resolving deltas:  79% (71/89)   
Resolving deltas:  80% (72/89)   
Resolving deltas:  82% (73/89)   
Resolving deltas:  83% (74/89)   
Resolving deltas:  88% (79/89)   
Resolving deltas:  94% (84/89)   
Resolving deltas:  95% (85/89)   
Resolving deltas:  97% (87/89)   
Resolving deltas: 100% (89/89)   
Resolving deltas: 100% (89/89), completed with 35 local objects.
From /pub/scm/linux/kernel/git/axboe/linux-2.6-block
 + f003741...7b61e3e for-2.6.26 -> block-for-2.6.26  (forced update)
Already on "2.6.25-rc9-mc7"
Automatic merge failed; fix conflicts and then commit the result.
From /pub/scm/linux/kernel/git/roland/infiniband
 + 4d33347...b9c5c03 for-2.6.26 -> infiniband  (forced update)
Checking out files:   5% (102/2026)   
Checking out files:   6% (122/2026)   
Checking out files:   7% (142/2026)   
Checking out files:   8% (163/2026)   
Checking out files:   9% (183/2026)   
Checking out files:  10% (203/2026)   
Checking out files:  11% (223/2026)   
Checking out files:  12% (244/2026)   
Checking out files:  13% (264/2026)   
Checking out files:  14% (284/2026)   
Checking out files:  15% (304/2026)   
Checking out files:  15% (321/2026)   
Checking out files:  16% (325/2026)   
Checking out files:  17% (345/2026)   
Checking out files:  18% (365/2026)   
Checking out files:  19% (385/2026)   
Checking out files:  20% (406/2026)   
Checking out files:  21% (426/2026)   
Checking out files:  21% (427/2026)   
Checking out files:  22% (446/2026)   
Checking out files:  23% (466/2026)   
Checking out files:  24% (487/2026)   
Checking out files:  25% (507/2026)   
Checking out files:  26% (527/2026)   
Checking out files:  27% (548/2026)   
Checking out files:  28% (568/2026)   
Checking out files:  29% (588/2026)   
Checking out files:  30% (608/2026)   
Checking out files:  31% (629/2026)   
Checking out files:  32% (649/2026)   
Checking out files:  33% (669/2026)   
Checking out files:  34% (689/2026)   
Checking out files:  35% (710/2026)   
Checking out files:  36% (730/2026)   
Checking out files:  37% (750/2026)   
Checking out files:  38% (770/2026)   
Checking out files:  39% (791/2026)   
Checking out files:  40% (811/2026)   
Checking out files:  41% (831/2026)   
Checking out files:  42% (851/2026)   
Checking out files:  43% (872/2026)   
Checking out files:  44% (892/2026)   
Checking out files:  45% (912/2026)   
Checking out files:  46% (932/2026)   
Checking out files:  46% (940/2026)   
Checking out files:  47% (953/2026)   
Checking out files:  48% (973/2026)   
Checking out files:  49% (993/2026)   
Checking out files:  50% (1013/2026)   
Checking out files:  51% (1034/2026)   
Checking out files:  52% (1054/2026)   
Checking out files:  53% (1074/2026)   
Checking out files:  54% (1095/2026)   
Checking out files:  55% (1115/2026)   
Checking out files:  56% (1135/2026)   
Checking out files:  57% (1155/2026)   
Checking out files:  58% (1176/2026)   
Checking out files:  59% (1196/2026)   
Checking out files:  60% (1216/2026)   
Checking out files:  61% (1236/2026)   
Checking out files:  62% (1257/2026)   
Checking out files:  63% (1277/2026)   
Checking out files:  63% (1282/2026)   
Checking out files:  64% (1297/2026)   
Checking out files:  65% (1317/2026)   
Checking out files:  66% (1338/2026)   
Checking out files:  67% (1358/2026)   
Checking out files:  68% (1378/2026)   
Checking out files:  69% (1398/2026)   
Checking out files:  70% (1419/2026)   
Checking out files:  71% (1439/2026)   
Checking out files:  72% (1459/2026)   
Checking out files:  73% (1479/2026)   
Checking out files:  74% (1500/2026)   
Checking out files:  75% (1520/2026)   
Checking out files:  76% (1540/2026)   
Checking out files:  76% (1541/2026)   
Checking out files:  77% (1561/2026)   
Checking out files:  78% (1581/2026)   
Checking out files:  79% (1601/2026)   
Checking out files:  80% (1621/2026)   
Checking out files:  81% (1642/2026)   
Checking out files:  82% (1662/2026)   
Checking out files:  83% (1682/2026)   
Checking out files:  84% (1702/2026)   
Checking out files:  84% (1704/2026)   
Checking out files:  85% (1723/2026)   
Checking out files:  86% (1743/2026)   
Checking out files:  86% (1762/2026)   
Checking out files:  87% (1763/2026)   
Checking out files:  88% (1783/2026)   
Checking out files:  89% (1804/2026)   
Checking out files:  90% (1824/2026)   
Checking out files:  91% (1844/2026)   
Checking out files:  92% (1864/2026)   
Checking out files:  93% (1885/2026)   
Checking out files:  94% (1905/2026)   
Checking out files:  95% (1925/2026)   
Checking out files:  96% (1945/2026)   
Checking out files:  97% (1966/2026)   
Checking out files:  98% (1986/2026)   
Checking out files:  98% (1997/2026)   
Checking out files:  99% (2006/2026)   
Checking out files: 100% (2026/2026)   
Checking out files: 100% (2026/2026), done.
Switched to branch "infiniband"
Finished one revert.
Checking out files:  27% (547/2013)   
Checking out files:  28% (564/2013)   
Checking out files:  29% (584/2013)   
Checking out files:  30% (604/2013)   
Checking out files:  31% (625/2013)   
Checking out files:  32% (645/2013)   
Checking out files:  33% (665/2013)   
Checking out files:  34% (685/2013)   
Checking out files:  35% (705/2013)   
Checking out files:  36% (725/2013)   
Checking out files:  37% (745/2013)   
Checking out files:  38% (765/2013)   
Checking out files:  39% (786/2013)   
Checking out files:  40% (806/2013)   
Checking out files:  41% (826/2013)   
Checking out files:  42% (846/2013)   
Checking out files:  43% (866/2013)   
Checking out files:  44% (886/2013)   
Checking out files:  45% (906/2013)   
Checking out files:  46% (926/2013)   
Checking out files:  47% (947/2013)   
Checking out files:  48% (967/2013)   
Checking out files:  49% (987/2013)   
Checking out files:  50% (1007/2013)   
Checking out files:  51% (1027/2013)   
Checking out files:  52% (1047/2013)   
Checking out files:  53% (1067/2013)   
Checking out files:  54% (1088/2013)   
Checking out files:  55% (1108/2013)   
Checking out files:  56% (1128/2013)   
Checking out files:  57% (1148/2013)   
Checking out files:  58% (1168/2013)   
Checking out files:  59% (1188/2013)   
Checking out files:  60% (1208/2013)   
Checking out files:  61% (1228/2013)   
Checking out files:  62% (1249/2013)   
Checking out files:  63% (1269/2013)   
Checking out files:  64% (1289/2013)   
Checking out files:  65% (1309/2013)   
Checking out files:  66% (1329/2013)   
Checking out files:  66% (1335/2013)   
Checking out files:  67% (1349/2013)   
Checking out files:  68% (1369/2013)   
Checking out files:  69% (1389/2013)   
Checking out files:  70% (1410/2013)   
Checking out files:  71% (1430/2013)   
Checking out files:  71% (1443/2013)   
Checking out files:  72% (1450/2013)   
Checking out files:  73% (1470/2013)   
Checking out files:  74% (1490/2013)   
Checking out files:  75% (1510/2013)   
Checking out files:  76% (1530/2013)   
Checking out files:  77% (1551/2013)   
Checking out files:  78% (1571/2013)   
Checking out files:  79% (1591/2013)   
Checking out files:  79% (1597/2013)   
Checking out files:  80% (1611/2013)   
Checking out files:  81% (1631/2013)   
Checking out files:  82% (1651/2013)   
Checking out files:  83% (1671/2013)   
Checking out files:  84% (1691/2013)   
Checking out files:  85% (1712/2013)   
Checking out files:  86% (1732/2013)   
Checking out files:  87% (1752/2013)   
Checking out files:  88% (1772/2013)   
Checking out files:  89% (1792/2013)   
Checking out files:  89% (1804/2013)   
Checking out files:  90% (1812/2013)   
Checking out files:  90% (1815/2013)   
Checking out files:  91% (1832/2013)   
Checking out files:  92% (1852/2013)   
Checking out files:  93% (1873/2013)   
Checking out files:  94% (1893/2013)   
Checking out files:  94% (1899/2013)   
Checking out files:  95% (1913/2013)   
Checking out files:  96% (1933/2013)   
Checking out files:  97% (1953/2013)   
Checking out files:  98% (1973/2013)   
Checking out files:  99% (1993/2013)   
Checking out files: 100% (2013/2013)   
Checking out files: 100% (2013/2013), done.
Switched to branch "2.6.25-rc9-mc7"
Already on "2.6.25-rc9-mc7"
Automatic merge failed; fix conflicts and then commit the result.
remote: Counting objects: 9, done.
remote: Compressing objects:  25% (1/4)   
remote: Compressing objects:  50% (2/4)   
remote: Compressing objects:  75% (3/4)   
remote: Compressing objects: 100% (4/4)   
remote: Compressing objects: 10remote: 0% (4/4), done.
remote: Total 5 (delta 4), reused 2 (delta 1)
From /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
   120dd64..25e8537  release    -> acpi
fatal: The remote end hung up unexpectedly
warning: too many files, skipping inexact rename detection
remote: Counting objects: 1   
remote: Counting objects: 476, done.
remote: Compressing objects:   0% (1/414)   
remote: Compressing objects:   1% (5/414)   
remote: Compressing objects:   2% (9/414)   
remote: Compressing objects:   3% (13/414)   
remote: Compressing objects:   4% (17/414)   
remote: Compressing objects:   5% (21/414)   
remote: Compressing objects:   6% (25/414)   
remote: Compressing objects:   7% (29/414)   
remote: Compressing objects:   8% (34/414)   
remote: Compressing objects:   9% (38/414)   
remote: Compressing objects:  10% (42/414)   
remote: Compressing objects:  11% (46/414)   
remote: Compressing objects:  12% (50/414)   
remote: Compressing objects:  13% (54/414)   
remote: Compressing objects:  14% (58/414)   
remote: Compressing objects:  15% (63/414)   
remote: Compressing objects:  16% (67/414)   
remote: Compressing objects:  17% (71/414)   
remote: Compressing objects:  18% (75/414)   
remote: Compressing objects:  19% (79/414)   
remote: Compressing objects:  20% (83/414)   
remote: Compressing objects:  21% (87/414)   
remote: Compressing objects:  22% (92/414)   
remote: Compressing objects:  23% (96/414)   
remote: Compressing objects:  24% (100/414)   
remote: Compressing objects:  25% (104/414)   
remote: Compressing objects:  26% (108/414)   
remote: Compressing objects:  27% (112/414)   
remote: Compressing objects:  28% (116/414)   
remote: Compressing objects:  29% (121/414)   
remote: Compressing objects:  30% (125/414)   
remote: Compressing objects:  31% (129/414)   
remote: Compressing objects:  32% (133/414)   
remote: Compressing objects:  33% (137/414)   
remote: Compressing objects:  34% (141/414)   
remote: Compressing objects:  35% (145/414)   
remote: Compressing objects:  36% (150/414)   
remote: Compressing objects:  37% (154/414)   
remote: Compressing objects:  38% (158/414)   
remote: Compressing objects:  39% (162/414)   
remote: Compressing objects:  40% (166/414)   
remote: Compressing objects:  41% (170/414)   
remote: Compressing objects:  42% (174/414)   
remote: Compressing objects:  43% (179/414)   
remote: Compressing objects:  44% (183/414)   
remote: Compressing objects:  45% (187/414)   
remote: Compressing objects:  46% (191/414)   
remote: Compressing objects:  47% (195/414)   
remote: Compressing objects:  48% (199/414)   
remote: Compressing objects:  49% (203/414)   
remote: Compressing objects:  50% (207/414)   
remote: Compressing objects:  51% (212/414)   
remote: Compressing objects:  52% (216/414)   
remote: Compressing objects:  53% (220/414)   
remote: Compressing objects:  54% (224/414)   
remote: Compressing objects:  55% (228/414)   
remote: Compressing objects:  56% (232/414)   
remote: Compressing objects:  57% (236/414)   
remote: Compressing objects:  58% (241/414)   
remote: Compressing objects:  59% (245/414)   
remote: Compressing objects:  60% (249/414)   
remote: Compressing objects:  61% (253/414)   
remote: Compressing objects:  62% (257/414)   
remote: Compressing objects:  63% (261/414)   
remote: Compressing objects:  64% (265/414)   
remote: Compressing objects:  65% (270/414)   
remote: Compressing objects:  66% (274/414)   
remote: Compressing objects:  67% (278/414)   
remote: Compressing objects:  68% (282/414)   
remote: Compressing objects:  69% (286/414)   
remote: Compressing objects:  70% (290/414)   
remote: Compressing objects:  71% (294/414)   
remote: Compressing objects:  72% (299/414)   
remote: Compressing objects:  73% (303/414)   
remote: Compressing objects:  74% (307/414)   
remote: Compressing objects:  75% (311/414)   
remote: Compressing objects:  76% (315/414)   
remote: Compressing objects:  77% (319/414)   
remote: Compressing objects:  78% (323/414)   
remote: Compressing objects:  79% (328/414)   
remote: Compressing objects:  80% (332/414)   
remote: Compressing objects:  81% (336/414)   
remote: Compressing objects:  82% (340/414)   
remote: Compressing objects:  83% (344/414)   
remote: Compressing objects:  84% (348/414)   
remote: Compressing objects:  85% (352/414)   
remote: Compressing objects:  86% (357/414)   
remote: Compressing objects:  87% (361/414)   
remote: Compressing objects:  88% (365/414)   
remote: Compressing objects:  89% (369/414)   
remote: Compressing objects:  90% (373/414)   
remote: Compressing objects:  91% (377/414)   
remote: Compressing objects:  92% (381/414)   
remote: Compressing objects:  93% (386/414)   
remote: Compressing objects:  94% (390/414)   
remote: Compressing objects:  95% (394/414)   
remote: Compressing objects:  96% (398/414)   
remote: Compressing objects:  97% (402/414)   
remote: Compressing objects:  98% (406/414)   
remote: Compressing objects:  99% (410/414)   
remote: Compressing objects: 100% (414/414)   
remote: Compressing objects: 100% (414/414), done.
remote: Total 414 (delta 346), reused 0 (delta 0)
Receiving objects:   0% (1/414)   
Receiving objects:   1% (5/414)   
Receiving objects:   2% (9/414)   
Receiving objects:   3% (13/414)   
Receiving objects:   4% (17/414)   
Receiving objects:   5% (21/414)   
Receiving objects:   6% (25/414)   
Receiving objects:   7% (29/414)   
Receiving objects:   8% (34/414)   
Receiving objects:   9% (38/414)   
Receiving objects:  10% (42/414)   
Receiving objects:  11% (46/414)   
Receiving objects:  12% (50/414)   
Receiving objects:  13% (54/414)   
Receiving objects:  14% (58/414)   
Receiving objects:  15% (63/414)   
Receiving objects:  16% (67/414)   
Receiving objects:  17% (71/414)   
Receiving objects:  18% (75/414)   
Receiving objects:  19% (79/414)   
Receiving objects:  20% (83/414)   
Receiving objects:  21% (87/414)   
Receiving objects:  22% (92/414)   
Receiving objects:  23% (96/414)   
Receiving objects:  24% (100/414)   
Receiving objects:  25% (104/414)   
Receiving objects:  26% (108/414)   
Receiving objects:  27% (112/414)   
Receiving objects:  28% (116/414)   
Receiving objects:  29% (121/414)   
Receiving objects:  30% (125/414)   
Receiving objects:  31% (129/414)   
Receiving objects:  32% (133/414)   
Receiving objects:  33% (137/414)   
Receiving objects:  34% (141/414)   
Receiving objects:  35% (145/414)   
Receiving objects:  36% (150/414)   
Receiving objects:  37% (154/414)   
Receiving objects:  38% (158/414)   
Receiving objects:  39% (162/414)   
Receiving objects:  40% (166/414)   
Receiving objects:  41% (170/414)   
Receiving objects:  42% (174/414)   
Receiving objects:  43% (179/414)   
Receiving objects:  44% (183/414)   
Receiving objects:  45% (187/414)   
Receiving objects:  46% (191/414)   
Receiving objects:  47% (195/414)   
Receiving objects:  48% (199/414)   
Receiving objects:  49% (203/414)   
Receiving objects:  50% (207/414)   
Receiving objects:  51% (212/414)   
Receiving objects:  52% (216/414)   
Receiving objects:  53% (220/414)   
Receiving objects:  54% (224/414)   
Receiving objects:  55% (228/414)   
Receiving objects:  56% (232/414)   
Receiving objects:  57% (236/414)   
Receiving objects:  58% (241/414)   
Receiving objects:  59% (245/414)   
Receiving objects:  60% (249/414)   
Receiving objects:  61% (253/414)   
Receiving objects:  62% (257/414)   
Receiving objects:  63% (261/414)   
Receiving objects:  64% (265/414)   
Receiving objects:  65% (270/414)   
Receiving objects:  66% (274/414)   
Receiving objects:  67% (278/414)   
Receiving objects:  68% (282/414)   
Receiving objects:  69% (286/414)   
Receiving objects:  70% (290/414)   
Receiving objects:  71% (294/414)   
Receiving objects:  72% (299/414)   
Receiving objects:  73% (303/414)   
Receiving objects:  74% (307/414)   
Receiving objects:  75% (311/414)   
Receiving objects:  76% (315/414)   
Receiving objects:  77% (319/414)   
Receiving objects:  78% (323/414)   
Receiving objects:  79% (328/414)   
Receiving objects:  80% (332/414)   
Receiving objects:  81% (336/414)   
Receiving objects:  82% (340/414)   
Receiving objects:  83% (344/414)   
Receiving objects:  84% (348/414)   
Receiving objects:  85% (352/414)   
Receiving objects:  86% (357/414)   
Receiving objects:  87% (361/414)   
Receiving objects:  88% (365/414)   
Receiving objects:  89% (369/414)   
Receiving objects:  90% (373/414)   
Receiving objects:  91% (377/414)   
Receiving objects:  92% (381/414)   
Receiving objects:  93% (386/414)   
Receiving objects:  94% (390/414)   
Receiving objects:  95% (394/414)   
Receiving objects:  96% (398/414)   
Receiving objects:  97% (402/414)   
Receiving objects:  98% (406/414)   
Receiving objects:  99% (410/414)   
Receiving objects: 100% (414/414)   
Receiving objects: 100% (414/414), 63.09 KiB, done.
Resolving deltas:   1% (4/346)   
Resolving deltas:   2% (7/346)   
Resolving deltas:   3% (12/346)   
Resolving deltas:  24% (85/346)   
Resolving deltas:  25% (87/346)   
Resolving deltas:  26% (91/346)   
Resolving deltas:  27% (94/346)   
Resolving deltas:  28% (97/346)   
Resolving deltas:  31% (110/346)   
Resolving deltas:  32% (114/346)   
Resolving deltas:  33% (115/346)   
Resolving deltas:  34% (118/346)   
Resolving deltas:  36% (127/346)   
Resolving deltas:  37% (129/346)   
Resolving deltas:  38% (133/346)   
Resolving deltas:  39% (135/346)   
Resolving deltas:  40% (139/346)   
Resolving deltas:  59% (206/346)   
Resolving deltas:  61% (212/346)   
Resolving deltas:  62% (215/346)   
Resolving deltas:  63% (221/346)   
Resolving deltas:  64% (222/346)   
Resolving deltas:  67% (234/346)   
Resolving deltas:  68% (236/346)   
Resolving deltas:  69% (241/346)   
Resolving deltas:  70% (243/346)   
Resolving deltas:  76% (265/346)   
Resolving deltas:  77% (267/346)   
Resolving deltas:  79% (276/346)   
Resolving deltas:  81% (283/346)   
Resolving deltas:  82% (284/346)   
Resolving deltas:  86% (301/346)   
Resolving deltas:  89% (308/346)   
Resolving deltas:  91% (316/346)   
Resolving deltas:  92% (319/346)   
Resolving deltas:  95% (331/346)   
Resolving deltas:  96% (334/346)   
Resolving deltas:  97% (336/346)   
Resolving deltas:  99% (344/346)   
Resolving deltas: 100% (346/346)   
Resolving deltas: 100% (346/346), completed with 62 local objects.
From /pub/scm/linux/kernel/git/davem/net-2.6.26
   2c8dd11..dd9e0dd  master     -> net
Already on "2.6.25-rc9-mc7"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
remote: Generating pack...
remote: Done counting 474 objects.
remote: Result has 358 objects.
remote: Deltifying 358 objects.
remote:    0% (1/358) done
remote:    1% (4/358) done
remote:    2% (8/358) done
remote:    3% (11/358) done
remote:    remote: 4% (15/358) done
remote:    5% (18/358) done
remote:    6% (22/358) done
remote:    7% (26/358) done
remote:    8% (29/358) done
remote:    9% (33/358) done
remote:   10% (36/3remote: 58) done
remote:   11% (40/358) done
remote:   12% (43/358) done
remote:   13% (47/358) done
remote:   14% (51/358) done
remote:   15% (54/358) done
remote:   16% (58/358) doneremote: 
remote:   17% (61/358) done
remote:   18% (65/358) done
remote:   19% (69/358) done
remote:   20% (72/358) done
remote:   21% (76/358) done
remote:   22% (79/358) done
remote:   23% (remote: 83/358) done
remote:   24% (86/358) done
remote:   25% (90/358) done
remote:   26% (94/358) done
remote:   27% (97/358) done
remote:   28% (101/358) done
remote:   29% (104/358remote: ) done
remote:   30% (108/358) done
remote:   31% (111/358) done
remote:   32% (115/358) done
remote:   33% (119/358) done
remote:   34% (122/358) done
remote:   35% (126/358) remote: done
remote:   36% (129/358) done
remote:   37% (133/358) done
remote:   38% (137/358) done
remote:   39% (140/358) done
remote:   40% (144/358) done
remote:   41% (147/358) doremote: ne
remote:   42% (151/358) done
remote:   43% (154/358) done
remote:   44% (158/358) done
remote:   45% (162/358) done
remote:   46% (165/358) done
remote:   47% (169/358) doneremote: 
remote:   48% (172/358) done
remote:   49% (176/358) done
remote:   50% (179/358) done
remote:   51% (183/358) done
remote:   52% (187/358) done
remote:   53% (190/358) done
remote:  remote:  54% (194/358) done
remote:   55% (197/358) done
remote:   56% (201/358) done
remote:   57% (205/358) done
remote:   58% (208/358) done
remote:   59% (212/358) done
remote:   6remote: 0% (215/358) done
remote:   61% (219/358) done
remote:   62% (222/358) done
remote:   63% (226/358) done
remote:   64% (230/358) done
remote:   65% (233/358) done
remote:   66%remote:  (237/358) done
remote:   67% (240/358) done
remote:   68% (244/358) done
remote:   69% (248/358) done
remote:   70% (251/358) done
remote:   71% (255/358) done
remote:   72% (remote: 258/358) done
remote:   73% (262/358) done
remote:   74% (265/358) done
remote:   75% (269/358) done
remote:   76% (273/358) done
remote:   77% (276/358) done
remote:   78% (28remote: 0/358) done
remote:   79% (283/358) done
remote:   80% (287/358) done
remote:   81% (290/358) done
remote:   82% (294/358) done
remote:   83% (298/358) done
remote:   84% (301/remote: 358) done
remote:   85% (305/358) done
remote:   86% (308/358) done
remote:   87% (312/358) done
remote:   88% (316/358) done
remote:   89% (319/358) done
remote:   90% (323/358) done
remote:   91% (326/358) done
remote:   92% (330/358) done
remote:   93% (333/358) done
remote:   remote: 94% (337/358) done
remote:   95% (341/358) done
remote:   96% (344/358) done
remote:   97% (348/358) done
remote:   98% (351/358) done
remote:   99% (355/358) done
remote:  100remote: % (358/358) done
remote: 
Receiving objects:   0% (1/358)   
Receiving objects:   1% (4/358)   
Receiving objects:   2% (8/358)   
Receiving objects:   3% (11/358)   
Receiving objects:   4% (15/358)   
Receiving objects:   5% (18/358)   
Receiving objects:   6% (22/358)   
Receiving objects:   7% (26/358)   
Receiving objects:   8% (29/358)   
Receiving objects:   9% (33/358)   
Receiving objects:  10% (36/358)   
Receiving objects:  11% (40/358)   
Receiving objects:  12% (43/358)   
Receiving objects:  13% (47/358)   
Receiving objects:  14% (51/358)   
Receiving objects:  15% (54/358)   
Receiving objects:  16% (58/358)   
Receiving objects:  17% (61/358)   
Receiving objects:  18% (65/358)   
Receiving objects:  19% (69/358)   
Receiving objects:  20% (72/358)   
Receiving objects:  21% (76/358)   
Receiving objects:  22% (79/358)   
Receiving objects:  23% (83/358)   
Receiving objects:  24% (86/358)   
Receiving objects:  25% (90/358)   
Receiving objects:  26% (94/358)   
Receiving objects:  27% (97/358)   
Receiving objects:  28% (101/358)   
Receiving objects:  29% (104/358)   
Receiving objects:  30% (108/358)   
Receiving objects:  31% (111/358)   
Receiving objects:  32% (115/358)   
Receiving objects:  33% (119/358)   
Receiving objects:  34% (122/358)   
Receiving objects:  35% (126/358)   
Receiving objects:  36% (129/358)   
Receiving objects:  37% (133/358)   
Receiving objects:  38% (137/358)   
Receiving objects:  39% (140/358)   
Receiving objects:  40% (144/358)   
Receiving objects:  41% (147/358)   
Receiving objects:  42% (151/358)   
Receiving objects:  43% (154/358)   
Receiving objects:  44% (158/358)   
Receiving objects:  45% (162/358)   
Receiving objects:  46% (165/358)   
Receiving objects:  47% (169/358)   
Receiving objects:  48% (172/358)   
Receiving objects:  49% (176/358)   
Receiving objects:  50% (179/358)   
Receiving objects:  51% (183/358)   
Receiving objects:  52% (187/358)   
Receiving objects:  53% (190/358)   
Receiving objects:  54% (194/358)   
Receiving objects:  55% (197/358)   
Receiving objects:  56% (201/358)   
Receiving objects:  57% (205/358)   
Receiving objects:  58% (208/358)   
Receiving objects:  59% (212/358)   
Receiving objects:  60% (215/358)   
Receiving objects:  61% (219/358)   
Receiving objects:  62% (222/358)   
Receiving objects:  63% (226/358)   
Receiving objects:  64% (230/358)   
Receiving objects:  65% (233/358)   
Receiving objects:  66% (237/358)   
Receiving objects:  67% (240/358)   
Receiving objects:  68% (244/358)   
remote: Total 358 (delta 317), reused 351 (delta 310)
Receiving objects:  69% (248/358)   
Receiving objects:  70% (251/358)   
Receiving objects:  71% (255/358)   
Receiving objects:  72% (258/358)   
Receiving objects:  73% (262/358)   
Receiving objects:  74% (265/358)   
Receiving objects:  75% (269/358)   
Receiving objects:  76% (273/358)   
Receiving objects:  77% (276/358)   
Receiving objects:  78% (280/358)   
Receiving objects:  79% (283/358)   
Receiving objects:  80% (287/358)   
Receiving objects:  81% (290/358)   
Receiving objects:  82% (294/358)   
Receiving objects:  83% (298/358)   
Receiving objects:  84% (301/358)   
Receiving objects:  85% (305/358)   
Receiving objects:  86% (308/358)   
Receiving objects:  87% (312/358)   
Receiving objects:  88% (316/358)   
Receiving objects:  89% (319/358)   
Receiving objects:  90% (323/358)   
Receiving objects:  91% (326/358)   
Receiving objects:  92% (330/358)   
Receiving objects:  93% (333/358)   
Receiving objects:  94% (337/358)   
Receiving objects:  95% (341/358)   
Receiving objects:  96% (344/358)   
Receiving objects:  97% (348/358)   
Receiving objects:  98% (351/358)   
Receiving objects:  99% (355/358)   
Receiving objects: 100% (358/358)   
Receiving objects: 100% (358/358), 63.03 KiB, done.
Resolving deltas:   0% (1/317)   
Resolving deltas:   4% (15/317)   
Resolving deltas:   5% (16/317)   
Resolving deltas:   6% (22/317)   
Resolving deltas:   7% (23/317)   
Resolving deltas:  18% (60/317)   
Resolving deltas:  19% (61/317)   
Resolving deltas:  24% (79/317)   
Resolving deltas:  25% (82/317)   
Resolving deltas:  26% (83/317)   
Resolving deltas:  27% (87/317)   
Resolving deltas:  30% (98/317)   
Resolving deltas:  31% (99/317)   
Resolving deltas:  32% (104/317)   
Resolving deltas:  33% (106/317)   
Resolving deltas:  34% (108/317)   
Resolving deltas:  35% (114/317)   
Resolving deltas:  36% (115/317)   
Resolving deltas:  37% (118/317)   
Resolving deltas:  38% (121/317)   
Resolving deltas:  39% (125/317)   
Resolving deltas:  40% (129/317)   
Resolving deltas:  41% (132/317)   
Resolving deltas:  42% (134/317)   
Resolving deltas:  44% (140/317)   
Resolving deltas:  45% (143/317)   
Resolving deltas:  52% (165/317)   
Resolving deltas:  53% (169/317)   
Resolving deltas:  55% (176/317)   
Resolving deltas:  56% (180/317)   
Resolving deltas:  57% (181/317)   
Resolving deltas:  58% (184/317)   
Resolving deltas:  60% (191/317)   
Resolving deltas:  61% (194/317)   
Resolving deltas:  62% (197/317)   
Resolving deltas:  63% (200/317)   
Resolving deltas:  66% (211/317)   
Resolving deltas:  67% (213/317)   
Resolving deltas:  68% (216/317)   
Resolving deltas:  69% (219/317)   
Resolving deltas:  70% (222/317)   
Resolving deltas:  71% (227/317)   
Resolving deltas:  72% (231/317)   
Resolving deltas:  73% (232/317)   
Resolving deltas:  74% (236/317)   
Resolving deltas:  75% (238/317)   
Resolving deltas:  76% (241/317)   
Resolving deltas:  77% (245/317)   
Resolving deltas:  78% (248/317)   
Resolving deltas:  83% (265/317)   
Resolving deltas:  88% (279/317)   
Resolving deltas:  89% (283/317)   
Resolving deltas:  90% (287/317)   
Resolving deltas:  91% (290/317)   
Resolving deltas:  92% (293/317)   
Resolving deltas:  93% (295/317)   
Resolving deltas:  94% (298/317)   
Resolving deltas:  95% (302/317)   
Resolving deltas:  99% (316/317)   
Resolving deltas: 100% (317/317)   
Resolving deltas: 100% (317/317), completed with 111 local objects.
From git://git390.osdl.marist.edu/pub/scm/linux-2.6
 + 46f246a...932b080 for-linus  -> s390-linus  (forced update)
Already on "2.6.25-rc9-mc7"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
From git://git390.osdl.marist.edu/pub/scm/linux-2.6
 + bc7fba4...932b080 features   -> s390  (forced update)
remote: Counting objects: 15, done.
remote: Compressing objects:  12% (1/8)   
remote: Compressing objects:  25% (2/8)   
remote: Compressing objects:  37% (3/8)   
remote: Compressing objects:  50% (4/8)   
remote: Compressing objects:  62% (5/8)   
remote: Compressing objects:  75% (6/8)   
remote: Compressing objects:  87% (7/8)   
remote: Compressing objects: 100% (8/8)   
remote: Compressing objects: 100% (8/8), done.
remote: Total 8 (delta 7), reused 1 (delta 0)
From git://git.infradead.org/battery-2.6
   e91926e..942ff38  master     -> battery
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
remote: Counting objects: 18, done.
remote: Compressing objects:  25% (1/4)   
remote: Compressing objects:  50% (2/4)   
remote: Compressing objects:  75% (3/4)   
remote: Compressing objects: 100% (4/4)   
remote: Compressing objects: 100% (4/4), done.
remote: Total 6 (delta 4), reused 3 (delta 2)
From git://oss.sgi.com:8090/xfs/xfs-2.6
   aed84ca..ec1f0ad  master     -> xfs
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
remote: Counting objects: 7272, done.
remote: Compressing objects:   0% (1/911)   
remote: Compressing objects:   1% (10/911)   
remote: Compressing objects:   2% (19/911)   
remote: Compressing objects:   3% (28/911)   
remote: Compressing objects:   4% (37/911)   
remote: Compressing objects:   5% (46/911)   
remote: Compressing objects:   6% (55/911)   
remote: Compressing objects:   7% (64/911)   
remote: Compressing objects:   8% (73/911)   
remote: Compressing objects:   9% (82/911)   
remote: Compressing objects:  10% (92/911)   
remote: Compressing objects:  11% (101/911)   
remote: Compressing objects:  12% (110/911)   
remote: Compressing objects:  13% (119/911)   
remote: Compressing objects:  14% (128/911)   
remote: Compressing objects:  15% (137/911)   
remote: Compressing objects:  16% (146/911)   
remote: Compressing objects:  17% (155/911)   
remote: Compressing objects:  18% (164/911)   
remote: Compressing objects:  19% (174/911)   
remote: Compressing objects:  20% (183/911)   
remote: Compressing objects:  21% (192/911)   
remote: Compressing objects:  22% (201/911)   
remote: Compressing objects:  23% (210/911)   
remote: Compressing objects:  24% (219/911)   
remote: Compressing objects:  25% (228/911)   
remote: Compressing objects:  26% (237/911)   
remote: Compressing objects:  27% (246/911)   
remote: Compressing objects:  28% (256/911)   
remote: Compressing objects:  29% (265/911)   
remote: Compressing objects:  30% (274/911)   
remote: Compressing objects:  31% (283/911)   
remote: Compressing objects:  32% (292/911)   
remote: Compressing objects:  33% (301/911)   
remote: Compressing objects:  34% (310/911)   
remote: Compressing objects:  35% (319/911)   
remote: Compressing objects:  36% (328/911)   
remote: Compressing objects:  37% (338/911)   
remote: Compressing objects:  38% (347/911)   
remote: Compressing objects:  39% (356/911)   
remote: Compressing objects:  40% (365/911)   
remote: Compressing objects:  41% (374/911)   
remote: Compressing objects:  42% (383/911)   
remote: Compressing objects:  43% (392/911)   
remote: Compressing objects:  44% (401/911)   
remote: Compressing objects:  45% (410/911)   
remote: Compressing objects:  46% (420/911)   
remote: Compressing objects:  47% (429/911)   
remote: Compressing objects:  48% (438/911)   
remote: Compressing objects:  49% (447/911)   
remote: Compressing objects:  50% (456/911)   
remote: Compressing objects:  51% (465/911)   
remote: Compressing objects:  52% (474/911)   
remote: Compressing objects:  53% (483/911)   
remote: Compressing objects:  54% (492/911)   
remote: Compressing objects:  55% (502/911)   
remote: Compressing objects:  56% (511/911)   
remote: Compressing objects:  57% (520/911)   
remote: Compressing objects:  58% (529/911)   
remote: Compressing objects:  59% (538/911)   
remote: Compressing objects:  60% (547/911)   
remote: Compressing objects:  61% (556/911)   
remote: Compressing objects:  62% (565/911)   
remote: Compressing objects:  63% (574/911)   
remote: Compressing objects:  64% (584/911)   
remote: Compressing objects:  65% (593/911)   
remote: Compressing objects:  66% (602/911)   
remote: Compressing objects:  67% (611/911)   
remote: Compressing objects:  68% (620/911)   
remote: Compressing objects:  69% (629/911)   
remote: Compressing objects:  70% (638/911)   
remote: Compressing objects:  71% (647/911)   
remote: Compressing objects:  72% (656/911)   
remote: Compressing objects:  73% (666/911)   
remote: Compressing objects:  74% (675/911)   
remote: Compressing objects:  75% (684/911)   
remote: Compressing objects:  76% (693/911)   
remote: Compressing objects:  77% (702/911)   
remote: Compressing objects:  78% (711/911)   
remote: Compressing objects:  79% (720/911)   
remote: Compressing objects:  80% (729/911)   
remote: Compressing objects:  81% (738/911)   
remote: Compressing objects:  82% (748/911)   
remote: Compressing objects:  83% (757/911)   
remote: Compressing objects:  84% (766/911)   
remote: Compressing objects:  85% (775/911)   
remote: Compressing objects:  86% (784/911)   
remote: Compressing objects:  87% (793/911)   
remote: Compressing objects:  88% (802/911)   
remote: Compressing objects:  89% (811/911)   
remote: Compressing objects:  90% (820/911)   
remote: Compressing objects:  91% (830/911)   
remote: Compressing objects:  92% (839/911)   
remote: Compressing objects:  93% (848/911)   
remote: Compressing objects:  94% (857/911)   
remote: Compressing objects:  95% (866/911)   
remote: Compressing objects:  96% (875/911)   
remote: Compressing objects:  97% (884/911)   
remote: Compressing objects:  98% (893/911)   
remote: Compressing objects:  99% (902/911)   
remote: Compressing objects: 100% (911/911)   
remote: Compressing objects: 100% (911/911), done.
Receiving objects:   0% (1/6660)   
Receiving objects:   1% (67/6660)   
Receiving objects:   2% (134/6660)   
Receiving objects:   3% (200/6660)   
Receiving objects:   4% (267/6660)   
Receiving objects:   5% (333/6660)   
Receiving objects:   6% (400/6660)   
Receiving objects:   7% (467/6660)   
Receiving objects:   8% (533/6660)   
Receiving objects:   9% (600/6660)   
Receiving objects:  10% (666/6660)   
Receiving objects:  11% (733/6660)   
Receiving objects:  12% (800/6660)   
Receiving objects:  13% (866/6660)   
Receiving objects:  14% (933/6660)   
Receiving objects:  15% (999/6660)   
Receiving objects:  16% (1066/6660)   
Receiving objects:  17% (1133/6660)   
Receiving objects:  18% (1199/6660)   
Receiving objects:  19% (1266/6660)   
Receiving objects:  20% (1332/6660)   
Receiving objects:  21% (1399/6660)   
Receiving objects:  22% (1466/6660)   
Receiving objects:  23% (1532/6660)   
Receiving objects:  24% (1599/6660)   
Receiving objects:  25% (1665/6660)   
Receiving objects:  26% (1732/6660)   
Receiving objects:  27% (1799/6660)   
Receiving objects:  28% (1865/6660)   
Receiving objects:  29% (1932/6660)   
Receiving objects:  30% (1998/6660)   
Receiving objects:  31% (2065/6660)   
Receiving objects:  32% (2132/6660)   
Receiving objects:  33% (2198/6660)   
Receiving objects:  34% (2265/6660)   
Receiving objects:  35% (2331/6660)   
Receiving objects:  36% (2398/6660)   
Receiving objects:  37% (2465/6660)   
Receiving objects:  38% (2531/6660)   
Receiving objects:  39% (2598/6660)   
Receiving objects:  40% (2664/6660)   
Receiving objects:  41% (2731/6660)   
Receiving objects:  42% (2798/6660)   
Receiving objects:  43% (2864/6660)   
Receiving objects:  44% (2931/6660)   
Receiving objects:  45% (2997/6660)   
Receiving objects:  46% (3064/6660)   
Receiving objects:  47% (3131/6660)   
Receiving objects:  48% (3197/6660)   
Receiving objects:  49% (3264/6660)   
Receiving objects:  50% (3330/6660)   
Receiving objects:  51% (3397/6660)   
Receiving objects:  52% (3464/6660)   
Receiving objects:  53% (3530/6660)   
Receiving objects:  54% (3597/6660)   
Receiving objects:  55% (3663/6660)   
Receiving objects:  56% (3730/6660)   
Receiving objects:  57% (3797/6660)   
Receiving objects:  58% (3863/6660)   
Receiving objects:  59% (3930/6660)   
Receiving objects:  60% (3996/6660)   
Receiving objects:  61% (4063/6660)   
Receiving objects:  62% (4130/6660)   
Receiving objects:  63% (4196/6660)   
Receiving objects:  64% (4263/6660)   
Receiving objects:  65% (4329/6660)   
Receiving objects:  66% (4396/6660)   
Receiving objects:  67% (4463/6660)   
Receiving objects:  68% (4529/6660)   
Receiving objects:  69% (4596/6660)   
Receiving objects:  70% (4662/6660)   
Receiving objects:  71% (4729/6660)   
Receiving objects:  72% (4796/6660)   
Receiving objects:  73% (4862/6660)   
Receiving objects:  74% (4929/6660)   
Receiving objects:  75% (4995/6660)   
remote: Total 6660 (delta 5739), reused 6660 (delta 5739)
Receiving objects:  76% (5062/6660)   
Receiving objects:  77% (5129/6660)   
Receiving objects:  78% (5195/6660)   
Receiving objects:  79% (5262/6660)   
Receiving objects:  80% (5328/6660)   
Receiving objects:  81% (5395/6660)   
Receiving objects:  82% (5462/6660)   
Receiving objects:  83% (5528/6660)   
Receiving objects:  84% (5595/6660)   
Receiving objects:  85% (5661/6660)   
Receiving objects:  86% (5728/6660)   
Receiving objects:  87% (5795/6660)   
Receiving objects:  88% (5861/6660)   
Receiving objects:  89% (5928/6660)   
Receiving objects:  90% (5994/6660)   
Receiving objects:  91% (6061/6660)   
Receiving objects:  92% (6128/6660)   
Receiving objects:  93% (6194/6660)   
Receiving objects:  94% (6261/6660)   
Receiving objects:  95% (6327/6660)   
Receiving objects:  96% (6394/6660)   
Receiving objects:  97% (6461/6660)   
Receiving objects:  98% (6527/6660)   
Receiving objects:  99% (6594/6660)   
Receiving objects: 100% (6660/6660)   
Receiving objects: 100% (6660/6660), 1.01 MiB, done.
Resolving deltas:   0% (5/5739)   
Resolving deltas:   1% (64/5739)   
Resolving deltas:   2% (116/5739)   
Resolving deltas:   5% (295/5739)   
Resolving deltas:   7% (424/5739)   
Resolving deltas:   8% (463/5739)   
Resolving deltas:   9% (538/5739)   
Resolving deltas:  11% (633/5739)   
Resolving deltas:  12% (690/5739)   
Resolving deltas:  14% (827/5739)   
Resolving deltas:  15% (861/5739)   
Resolving deltas:  16% (919/5739)   
Resolving deltas:  17% (1023/5739)   
Resolving deltas:  18% (1038/5739)   
Resolving deltas:  24% (1383/5739)   
Resolving deltas:  28% (1644/5739)   
Resolving deltas:  29% (1674/5739)   
Resolving deltas:  30% (1744/5739)   
Resolving deltas:  34% (1971/5739)   
Resolving deltas:  35% (2034/5739)   
Resolving deltas:  38% (2222/5739)   
Resolving deltas:  41% (2362/5739)   
Resolving deltas:  44% (2549/5739)   
Resolving deltas:  45% (2585/5739)   
Resolving deltas:  55% (3204/5739)   
Resolving deltas:  56% (3214/5739)   
Resolving deltas:  57% (3272/5739)   
Resolving deltas:  58% (3350/5739)   
Resolving deltas:  59% (3398/5739)   
Resolving deltas:  60% (3445/5739)   
Resolving deltas:  61% (3501/5739)   
Resolving deltas:  62% (3561/5739)   
Resolving deltas:  63% (3616/5739)   
Resolving deltas:  64% (3673/5739)   
Resolving deltas:  65% (3731/5739)   
Resolving deltas:  66% (3791/5739)   
Resolving deltas:  67% (3849/5739)   
Resolving deltas:  68% (3935/5739)   
Resolving deltas:  69% (3962/5739)   
Resolving deltas:  70% (4018/5739)   
Resolving deltas:  77% (4436/5739)   
Resolving deltas:  78% (4477/5739)   
Resolving deltas:  79% (4534/5739)   
Resolving deltas:  80% (4604/5739)   
Resolving deltas:  81% (4649/5739)   
Resolving deltas:  82% (4708/5739)   
Resolving deltas:  83% (4764/5739)   
Resolving deltas:  84% (4821/5739)   
Resolving deltas:  85% (4879/5739)   
Resolving deltas:  86% (4941/5739)   
Resolving deltas:  87% (4993/5739)   
Resolving deltas:  91% (5250/5739)   
Resolving deltas:  92% (5296/5739)   
Resolving deltas:  93% (5339/5739)   
Resolving deltas:  94% (5428/5739)   
Resolving deltas:  95% (5468/5739)   
Resolving deltas:  96% (5516/5739)   
Resolving deltas:  97% (5604/5739)   
Resolving deltas:  98% (5665/5739)   
Resolving deltas:  99% (5705/5739)   
Resolving deltas: 100% (5739/5739)   
Resolving deltas: 100% (5739/5739), completed with 578 local objects.
From /pub/scm/linux/kernel/git/x86/linux-2.6-x86
 + 8cb45f7...1470232 master     -> x86  (forced update)
Checking out files:  21% (777/3572)   
Checking out files:  22% (786/3572)   
Checking out files:  23% (822/3572)   
Checking out files:  24% (858/3572)   
Checking out files:  25% (893/3572)   
Checking out files:  26% (929/3572)   
Checking out files:  27% (965/3572)   
Checking out files:  28% (1001/3572)   
Checking out files:  29% (1036/3572)   
Checking out files:  30% (1072/3572)   
Checking out files:  31% (1108/3572)   
Checking out files:  32% (1144/3572)   
Checking out files:  33% (1179/3572)   
Checking out files:  34% (1215/3572)   
Checking out files:  35% (1251/3572)   
Checking out files:  35% (1278/3572)   
Checking out files:  36% (1286/3572)   
Checking out files:  37% (1322/3572)   
Checking out files:  38% (1358/3572)   
Checking out files:  39% (1394/3572)   
Checking out files:  40% (1429/3572)   
Checking out files:  41% (1465/3572)   
Checking out files:  42% (1501/3572)   
Checking out files:  43% (1536/3572)   
Checking out files:  44% (1572/3572)   
Checking out files:  45% (1608/3572)   
Checking out files:  46% (1644/3572)   
Checking out files:  47% (1679/3572)   
Checking out files:  47% (1699/3572)   
Checking out files:  48% (1715/3572)   
Checking out files:  49% (1751/3572)   
Checking out files:  50% (1786/3572)   
Checking out files:  51% (1822/3572)   
Checking out files:  52% (1858/3572)   
Checking out files:  53% (1894/3572)   
Checking out files:  54% (1929/3572)   
Checking out files:  55% (1965/3572)   
Checking out files:  56% (2001/3572)   
Checking out files:  57% (2037/3572)   
Checking out files:  58% (2072/3572)   
Checking out files:  59% (2108/3572)   
Checking out files:  60% (2144/3572)   
Checking out files:  61% (2179/3572)   
Checking out files:  61% (2201/3572)   
Checking out files:  62% (2215/3572)   
Checking out files:  63% (2251/3572)   
Checking out files:  64% (2287/3572)   
Checking out files:  65% (2322/3572)   
Checking out files:  66% (2358/3572)   
Checking out files:  67% (2394/3572)   
Checking out files:  68% (2429/3572)   
Checking out files:  69% (2465/3572)   
Checking out files:  70% (2501/3572)   
Checking out files:  71% (2537/3572)   
Checking out files:  72% (2572/3572)   
Checking out files:  72% (2576/3572)   
Checking out files:  73% (2608/3572)   
Checking out files:  74% (2644/3572)   
Checking out files:  75% (2679/3572)   
Checking out files:  76% (2715/3572)   
Checking out files:  77% (2751/3572)   
Checking out files:  78% (2787/3572)   
Checking out files:  79% (2822/3572)   
Checking out files:  80% (2858/3572)   
Checking out files:  81% (2894/3572)   
Checking out files:  82% (2930/3572)   
Checking out files:  83% (2965/3572)   
Checking out files:  84% (3001/3572)   
Checking out files:  85% (3037/3572)   
Checking out files:  86% (3072/3572)   
Checking out files:  87% (3108/3572)   
Checking out files:  88% (3144/3572)   
Checking out files:  89% (3180/3572)   
Checking out files:  90% (3215/3572)   
Checking out files:  91% (3251/3572)   
Checking out files:  92% (3287/3572)   
Checking out files:  93% (3322/3572)   
Checking out files:  94% (3358/3572)   
Checking out files:  94% (3377/3572)   
Checking out files:  95% (3394/3572)   
Checking out files:  96% (3430/3572)   
Checking out files:  97% (3465/3572)   
Checking out files:  98% (3501/3572)   
Checking out files:  99% (3537/3572)   
Checking out files: 100% (3572/3572)   
Checking out files: 100% (3572/3572), done.
Switched to branch "x86"
Finished one revert.
Checking out files:   1% (70/3571)   
Checking out files:   2% (72/3571)   
Checking out files:   3% (108/3571)   
Checking out files:   4% (143/3571)   
Checking out files:   5% (179/3571)   
Checking out files:   6% (215/3571)   
Checking out files:   6% (239/3571)   
Checking out files:   7% (250/3571)   
Checking out files:   8% (286/3571)   
Checking out files:   9% (322/3571)   
Checking out files:  10% (358/3571)   
Checking out files:  11% (393/3571)   
Checking out files:  11% (412/3571)   
Checking out files:  12% (429/3571)   
Checking out files:  13% (465/3571)   
Checking out files:  14% (500/3571)   
Checking out files:  15% (536/3571)   
Checking out files:  16% (572/3571)   
Checking out files:  17% (608/3571)   
Checking out files:  18% (643/3571)   
Checking out files:  18% (660/3571)   
Checking out files:  19% (679/3571)   
Checking out files:  20% (715/3571)   
Checking out files:  21% (750/3571)   
Checking out files:  22% (786/3571)   
Checking out files:  23% (822/3571)   
Checking out files:  24% (858/3571)   
Checking out files:  25% (893/3571)   
Checking out files:  26% (929/3571)   
Checking out files:  27% (965/3571)   
Checking out files:  27% (989/3571)   
Checking out files:  28% (1000/3571)   
Checking out files:  29% (1036/3571)   
Checking out files:  30% (1072/3571)   
Checking out files:  31% (1108/3571)   
Checking out files:  32% (1143/3571)   
Checking out files:  33% (1179/3571)   
Checking out files:  34% (1215/3571)   
Checking out files:  35% (1250/3571)   
Checking out files:  36% (1286/3571)   
Checking out files:  37% (1322/3571)   
Checking out files:  38% (1357/3571)   
Checking out files:  39% (1393/3571)   
Checking out files:  40% (1429/3571)   
Checking out files:  41% (1465/3571)   
Checking out files:  42% (1500/3571)   
Checking out files:  43% (1536/3571)   
Checking out files:  44% (1572/3571)   
Checking out files:  45% (1607/3571)   
Checking out files:  46% (1643/3571)   
Checking out files:  47% (1679/3571)   
Checking out files:  48% (1715/3571)   
Checking out files:  48% (1720/3571)   
Checking out files:  49% (1750/3571)   
Checking out files:  50% (1786/3571)   
Checking out files:  51% (1822/3571)   
Checking out files:  52% (1857/3571)   
Checking out files:  53% (1893/3571)   
Checking out files:  54% (1929/3571)   
Checking out files:  55% (1965/3571)   
Checking out files:  56% (2000/3571)   
Checking out files:  57% (2036/3571)   
Checking out files:  58% (2072/3571)   
Checking out files:  59% (2107/3571)   
Checking out files:  60% (2143/3571)   
Checking out files:  61% (2179/3571)   
Checking out files:  62% (2215/3571)   
Checking out files:  63% (2250/3571)   
Checking out files:  64% (2286/3571)   
Checking out files:  65% (2322/3571)   
Checking out files:  66% (2357/3571)   
Checking out files:  66% (2359/3571)   
Checking out files:  66% (2363/3571)   
Checking out files:  66% (2374/3571)   
Checking out files:  66% (2380/3571)   
Checking out files:  66% (2385/3571)   
Checking out files:  67% (2393/3571)   
Checking out files:  68% (2429/3571)   
Checking out files:  68% (2440/3571)   
Checking out files:  69% (2464/3571)   
Checking out files:  70% (2500/3571)   
Checking out files:  71% (2536/3571)   
Checking out files:  72% (2572/3571)   
Checking out files:  73% (2607/3571)   
Checking out files:  74% (2643/3571)   
Checking out files:  75% (2679/3571)   
Checking out files:  76% (2714/3571)   
Checking out files:  77% (2750/3571)   
Checking out files:  78% (2786/3571)   
Checking out files:  79% (2822/3571)   
Checking out files:  80% (2857/3571)   
Checking out files:  81% (2893/3571)   
Checking out files:  82% (2929/3571)   
Checking out files:  83% (2964/3571)   
Checking out files:  84% (3000/3571)   
Checking out files:  85% (3036/3571)   
Checking out files:  85% (3041/3571)   
Checking out files:  86% (3072/3571)   
Checking out files:  87% (3107/3571)   
Checking out files:  88% (3143/3571)   
Checking out files:  89% (3179/3571)   
Checking out files:  90% (3214/3571)   
Checking out files:  91% (3250/3571)   
Checking out files:  92% (3286/3571)   
Checking out files:  93% (3322/3571)   
Checking out files:  94% (3357/3571)   
Checking out files:  95% (3393/3571)   
Checking out files:  96% (3429/3571)   
Checking out files:  97% (3464/3571)   
Checking out files:  98% (3500/3571)   
Checking out files:  99% (3536/3571)   
Checking out files: 100% (3571/3571)   
Checking out files: 100% (3571/3571), done.
Switched to branch "2.6.25-rc9-mc7"
Already on "2.6.25-rc9-mc7"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
Already on "2.6.25-rc9-mc7"
warning: too many files, skipping inexact rename detection
Automatic merge failed; fix conflicts and then commit the result.
fatal: Not a valid object name: '2.6.25-rc8'.
Checking out files:   0% (7/3953)   
Checking out files:   1% (40/3953)   
Checking out files:   2% (80/3953)   
Checking out files:   3% (119/3953)   
Checking out files:   4% (159/3953)   
Checking out files:   5% (198/3953)   
Checking out files:   6% (238/3953)   
Checking out files:   7% (277/3953)   
Checking out files:   8% (317/3953)   
Checking out files:   9% (356/3953)   
Checking out files:  10% (396/3953)   
Checking out files:  11% (435/3953)   
Checking out files:  12% (475/3953)   
Checking out files:  13% (514/3953)   
Checking out files:  14% (554/3953)   
Checking out files:  15% (593/3953)   
Checking out files:  16% (633/3953)   
Checking out files:  17% (673/3953)   
Checking out files:  18% (712/3953)   
Checking out files:  19% (752/3953)   
Checking out files:  20% (791/3953)   
Checking out files:  21% (831/3953)   
Checking out files:  21% (858/3953)   
Checking out files:  22% (870/3953)   
Checking out files:  23% (910/3953)   
Checking out files:  24% (949/3953)   
Checking out files:  24% (955/3953)   
Checking out files:  24% (978/3953)   
Checking out files:  25% (989/3953)   
Checking out files:  26% (1028/3953)   
Checking out files:  26% (1062/3953)   
Checking out files:  27% (1068/3953)   
Checking out files:  28% (1107/3953)   
Checking out files:  29% (1147/3953)   
Checking out files:  29% (1182/3953)   
Checking out files:  30% (1186/3953)   
Checking out files:  31% (1226/3953)   
Checking out files:  32% (1265/3953)   
Checking out files:  33% (1305/3953)   
Checking out files:  33% (1307/3953)   
Checking out files:  34% (1345/3953)   
Checking out files:  35% (1384/3953)   
Checking out files:  36% (1424/3953)   
Checking out files:  37% (1463/3953)   
Checking out files:  38% (1503/3953)   
Checking out files:  39% (1542/3953)   
Checking out files:  40% (1582/3953)   
Checking out files:  40% (1596/3953)   
Checking out files:  41% (1621/3953)   
Checking out files:  42% (1661/3953)   
Checking out files:  43% (1700/3953)   
Checking out files:  44% (1740/3953)   
Checking out files:  45% (1779/3953)   
Checking out files:  46% (1819/3953)   
Checking out files:  47% (1858/3953)   
Checking out files:  47% (1864/3953)   
Checking out files:  48% (1898/3953)   
Checking out files:  49% (1937/3953)   
Checking out files:  50% (1977/3953)   
Checking out files:  51% (2017/3953)   
Checking out files:  52% (2056/3953)   
Checking out files:  53% (2096/3953)   
Checking out files:  54% (2135/3953)   
Checking out files:  55% (2175/3953)   
Checking out files:  56% (2214/3953)   
Checking out files:  56% (2231/3953)   
Checking out files:  57% (2254/3953)   
Checking out files:  58% (2293/3953)   
Checking out files:  59% (2333/3953)   
Checking out files:  60% (2372/3953)   
Checking out files:  61% (2412/3953)   
Checking out files:  62% (2451/3953)   
Checking out files:  62% (2456/3953)   
Checking out files:  63% (2491/3953)   
Checking out files:  64% (2530/3953)   
Checking out files:  65% (2570/3953)   
Checking out files:  66% (2609/3953)   
Checking out files:  66% (2636/3953)   
Checking out files:  67% (2649/3953)   
Checking out files:  68% (2689/3953)   
Checking out files:  69% (2728/3953)   
Checking out files:  70% (2768/3953)   
Checking out files:  71% (2807/3953)   
Checking out files:  72% (2847/3953)   
Checking out files:  73% (2886/3953)   
Checking out files:  74% (2926/3953)   
Checking out files:  75% (2965/3953)   
Checking out files:  76% (3005/3953)   
Checking out files:  77% (3044/3953)   
Checking out files:  78% (3084/3953)   
Checking out files:  79% (3123/3953)   
Checking out files:  79% (3134/3953)   
Checking out files:  80% (3163/3953)   
Checking out files:  81% (3202/3953)   
Checking out files:  82% (3242/3953)   
Checking out files:  83% (3281/3953)   
Checking out files:  84% (3321/3953)   
Checking out files:  85% (3361/3953)   
Checking out files:  86% (3400/3953)   
Checking out files:  87% (3440/3953)   
Checking out files:  88% (3479/3953)   
Checking out files:  89% (3519/3953)   
Checking out files:  90% (3558/3953)   
Checking out files:  91% (3598/3953)   
Checking out files:  92% (3637/3953)   
Checking out files:  93% (3677/3953)   
Checking out files:  94% (3716/3953)   
Checking out files:  95% (3756/3953)   
Checking out files:  96% (3795/3953)   
Checking out files:  97% (3835/3953)   
Checking out files:  98% (3874/3953)   
Checking out files:  99% (3914/3953)   
Checking out files:  99% (3937/3953)   
Checking out files: 100% (3953/3953)   
Checking out files: 100% (3953/3953), done.
Switched to branch "doc"
Checking out files:  13% (528/3963)   
Checking out files:  14% (555/3963)   
Checking out files:  15% (595/3963)   
Checking out files:  16% (635/3963)   
Checking out files:  17% (674/3963)   
Checking out files:  18% (714/3963)   
Checking out files:  19% (753/3963)   
Checking out files:  20% (793/3963)   
Checking out files:  21% (833/3963)   
Checking out files:  21% (840/3963)   
Checking out files:  22% (872/3963)   
Checking out files:  23% (912/3963)   
Checking out files:  24% (952/3963)   
Checking out files:  25% (991/3963)   
Checking out files:  26% (1031/3963)   
Checking out files:  27% (1071/3963)   
Checking out files:  28% (1110/3963)   
Checking out files:  28% (1147/3963)   
Checking out files:  29% (1150/3963)   
Checking out files:  30% (1189/3963)   
Checking out files:  30% (1209/3963)   
Checking out files:  31% (1229/3963)   
Checking out files:  31% (1232/3963)   
Checking out files:  32% (1269/3963)   
Checking out files:  33% (1308/3963)   
Checking out files:  34% (1348/3963)   
Checking out files:  35% (1388/3963)   
Checking out files:  36% (1427/3963)   
Checking out files:  37% (1467/3963)   
Checking out files:  38% (1506/3963)   
Checking out files:  39% (1546/3963)   
Checking out files:  40% (1586/3963)   
Checking out files:  41% (1625/3963)   
Checking out files:  42% (1665/3963)   
Checking out files:  43% (1705/3963)   
Checking out files:  44% (1744/3963)   
Checking out files:  45% (1784/3963)   
Checking out files:  46% (1823/3963)   
Checking out files:  47% (1863/3963)   
Checking out files:  48% (1903/3963)   
Checking out files:  49% (1942/3963)   
Checking out files:  49% (1946/3963)   
Checking out files:  50% (1982/3963)   
Checking out files:  50% (2004/3963)   
Checking out files:  51% (2022/3963)   
Checking out files:  52% (2061/3963)   
Checking out files:  53% (2101/3963)   
Checking out files:  54% (2141/3963)   
Checking out files:  54% (2179/3963)   
Checking out files:  55% (2180/3963)   
Checking out files:  55% (2213/3963)   
Checking out files:  56% (2220/3963)   
Checking out files:  56% (2249/3963)   
Checking out files:  57% (2259/3963)   
Checking out files:  58% (2299/3963)   
Checking out files:  58% (2300/3963)   
Checking out files:  59% (2339/3963)   
Checking out files:  60% (2378/3963)   
Checking out files:  61% (2418/3963)   
Checking out files:  61% (2437/3963)   
Checking out files:  62% (2458/3963)   
Checking out files:  63% (2497/3963)   
Checking out files:  64% (2537/3963)   
Checking out files:  65% (2576/3963)   
Checking out files:  66% (2616/3963)   
Checking out files:  66% (2635/3963)   
Checking out files:  67% (2656/3963)   
Checking out files:  68% (2695/3963)   
Checking out files:  69% (2735/3963)   
Checking out files:  70% (2775/3963)   
Checking out files:  71% (2814/3963)   
Checking out files:  72% (2854/3963)   
Checking out files:  73% (2893/3963)   
Checking out files:  74% (2933/3963)   
Checking out files:  75% (2973/3963)   
Checking out files:  76% (3012/3963)   
Checking out files:  77% (3052/3963)   
Checking out files:  78% (3092/3963)   
Checking out files:  79% (3131/3963)   
Checking out files:  80% (3171/3963)   
Checking out files:  81% (3211/3963)   
Checking out files:  81% (3243/3963)   
Checking out files:  82% (3250/3963)   
Checking out files:  83% (3290/3963)   
Checking out files:  84% (3329/3963)   
Checking out files:  85% (3369/3963)   
Checking out files:  86% (3409/3963)   
Checking out files:  87% (3448/3963)   
Checking out files:  88% (3488/3963)   
Checking out files:  89% (3528/3963)   
Checking out files:  90% (3567/3963)   
Checking out files:  91% (3607/3963)   
Checking out files:  92% (3646/3963)   
Checking out files:  93% (3686/3963)   
Checking out files:  94% (3726/3963)   
Checking out files:  95% (3765/3963)   
Checking out files:  96% (3805/3963)   
Checking out files:  97% (3845/3963)   
Checking out files:  98% (3884/3963)   
Checking out files:  99% (3924/3963)   
Checking out files: 100% (3963/3963)   
Checking out files: 100% (3963/3963), done.
Switched to branch "2.6.25-rc9-mc7"
Already on "2.6.25-rc9-mc7"
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
remote: Counting objects: 1   
remote: Counting objects: 19, done.
remote: Compressing objects:  10% (1/10)   
remote: Compressing objects:  20% (2/10)   
remote: Compressing objects:  30% (3/10)   
remote: Compressing objects:  40% (4/10)   
remote: Compressing objects:  50% (5/10)   
remote: Compressing objects:  60% (6/10)   
remote: Compressing objects:remote:   70% (7/10)   
remote: Compressing objects:  80% (8/10)   
remote: Compressing objects:  90% (9/10)   
remote: Compressing objects: 100% (10/10)   
remote: Comremote: pressing objects: 100% (10/10), done.
remote: Total 10 (delta 9), reused 0 (delta 0)
From /pub/scm/linux/kernel/git/teigland/dlm
   e2f563c..231aaed  next       -> dlm
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
Checking out files:   2% (86/3915)   
Checking out files:   3% (118/3915)   
Checking out files:   4% (157/3915)   
Checking out files:   5% (196/3915)   
Checking out files:   5% (229/3915)   
Checking out files:   6% (235/3915)   
Checking out files:   7% (275/3915)   
Checking out files:   8% (314/3915)   
Checking out files:   9% (353/3915)   
Checking out files:  10% (392/3915)   
Checking out files:  11% (431/3915)   
Checking out files:  12% (470/3915)   
Checking out files:  12% (480/3915)   
Checking out files:  13% (509/3915)   
Checking out files:  14% (549/3915)   
Checking out files:  15% (588/3915)   
Checking out files:  16% (627/3915)   
Checking out files:  17% (666/3915)   
Checking out files:  18% (705/3915)   
Checking out files:  19% (744/3915)   
Checking out files:  19% (748/3915)   
Checking out files:  20% (783/3915)   
Checking out files:  21% (823/3915)   
Checking out files:  22% (862/3915)   
Checking out files:  23% (901/3915)   
Checking out files:  24% (940/3915)   
Checking out files:  25% (979/3915)   
Checking out files:  26% (1018/3915)   
Checking out files:  27% (1058/3915)   
Checking out files:  28% (1097/3915)   
Checking out files:  29% (1136/3915)   
Checking out files:  30% (1175/3915)   
Checking out files:  31% (1214/3915)   
Checking out files:  32% (1253/3915)   
Checking out files:  32% (1262/3915)   
Checking out files:  33% (1292/3915)   
Checking out files:  34% (1332/3915)   
Checking out files:  35% (1371/3915)   
Checking out files:  36% (1410/3915)   
Checking out files:  37% (1449/3915)   
Checking out files:  38% (1488/3915)   
Checking out files:  39% (1527/3915)   
Checking out files:  40% (1566/3915)   
Checking out files:  40% (1591/3915)   
Checking out files:  41% (1606/3915)   
Checking out files:  42% (1645/3915)   
Checking out files:  43% (1684/3915)   
Checking out files:  44% (1723/3915)   
Checking out files:  45% (1762/3915)   
Checking out files:  46% (1801/3915)   
Checking out files:  47% (1841/3915)   
Checking out files:  47% (1857/3915)   
Checking out files:  48% (1880/3915)   
Checking out files:  49% (1919/3915)   
Checking out files:  50% (1958/3915)   
Checking out files:  51% (1997/3915)   
Checking out files:  52% (2036/3915)   
Checking out files:  53% (2075/3915)   
Checking out files:  54% (2115/3915)   
Checking out files:  54% (2118/3915)   
Checking out files:  55% (2154/3915)   
Checking out files:  56% (2193/3915)   
Checking out files:  57% (2232/3915)   
Checking out files:  58% (2271/3915)   
Checking out files:  58% (2297/3915)   
Checking out files:  59% (2310/3915)   
Checking out files:  60% (2349/3915)   
Checking out files:  61% (2389/3915)   
Checking out files:  62% (2428/3915)   
Checking out files:  63% (2467/3915)   
Checking out files:  63% (2492/3915)   
Checking out files:  64% (2506/3915)   
Checking out files:  65% (2545/3915)   
Checking out files:  66% (2584/3915)   
Checking out files:  67% (2624/3915)   
Checking out files:  67% (2655/3915)   
Checking out files:  68% (2663/3915)   
Checking out files:  69% (2702/3915)   
Checking out files:  70% (2741/3915)   
Checking out files:  71% (2780/3915)   
Checking out files:  71% (2793/3915)   
Checking out files:  72% (2819/3915)   
Checking out files:  73% (2858/3915)   
Checking out files:  73% (2897/3915)   
Checking out files:  74% (2898/3915)   
Checking out files:  75% (2937/3915)   
Checking out files:  76% (2976/3915)   
Checking out files:  77% (3015/3915)   
Checking out files:  78% (3054/3915)   
Checking out files:  79% (3093/3915)   
Checking out files:  80% (3132/3915)   
Checking out files:  81% (3172/3915)   
Checking out files:  82% (3211/3915)   
Checking out files:  83% (3250/3915)   
Checking out files:  84% (3289/3915)   
Checking out files:  85% (3328/3915)   
Checking out files:  86% (3367/3915)   
Checking out files:  87% (3407/3915)   
Checking out files:  87% (3438/3915)   
Checking out files:  88% (3446/3915)   
Checking out files:  89% (3485/3915)   
Checking out files:  90% (3524/3915)   
Checking out files:  91% (3563/3915)   
Checking out files:  92% (3602/3915)   
Checking out files:  93% (3641/3915)   
Checking out files:  94% (3681/3915)   
Checking out files:  95% (3720/3915)   
Checking out files:  96% (3759/3915)   
Checking out files:  97% (3798/3915)   
Checking out files:  98% (3837/3915)   
Checking out files:  99% (3876/3915)   
Checking out files: 100% (3915/3915)   
Checking out files: 100% (3915/3915), done.
Switched to branch "m68k"
.dotest/patch:353: space before tab in indent.
  			  m68k Macintosh. Support >16bit I/O spaces
.dotest/patch:382: space before tab in indent.
  			  m68k Macintosh. Support >16bit I/O spaces
.dotest/patch:404: trailing whitespace.
 * transfer - some PC's will use the I/O bus, m68k's must use 
.dotest/patch:426: trailing whitespace.
 * transfer - some PC's will use the I/O bus, m68k's must use 
warning: 4 lines add whitespace errors.
.dotest/patch:868: space before tab in indent.
  			break;
.dotest/patch:870: space before tab in indent.
   	} while (--poll_count);
.dotest/patch:875: space before tab in indent.
   	if (!poll_count) {
.dotest/patch:880: space before tab in indent.
   	} else {
.dotest/patch:1631: space before tab in indent.
		   	   shouldn't this be a given if we have it here ? */
warning: squelched 6 whitespace errors
warning: 11 lines add whitespace errors.
Checking out files:   4% (168/3985)   
Checking out files:   5% (200/3985)   
Checking out files:   6% (240/3985)   
Checking out files:   7% (279/3985)   
Checking out files:   8% (319/3985)   
Checking out files:   9% (359/3985)   
Checking out files:   9% (361/3985)   
Checking out files:   9% (362/3985)   
Checking out files:  10% (399/3985)   
Checking out files:  11% (439/3985)   
Checking out files:  12% (479/3985)   
Checking out files:  13% (519/3985)   
Checking out files:  14% (558/3985)   
Checking out files:  15% (598/3985)   
Checking out files:  16% (638/3985)   
Checking out files:  17% (678/3985)   
Checking out files:  18% (718/3985)   
Checking out files:  19% (758/3985)   
Checking out files:  19% (795/3985)   
Checking out files:  20% (797/3985)   
Checking out files:  21% (837/3985)   
Checking out files:  22% (877/3985)   
Checking out files:  23% (917/3985)   
Checking out files:  24% (957/3985)   
Checking out files:  24% (960/3985)   
Checking out files:  25% (997/3985)   
Checking out files:  26% (1037/3985)   
Checking out files:  27% (1076/3985)   
Checking out files:  28% (1116/3985)   
Checking out files:  28% (1154/3985)   
Checking out files:  29% (1156/3985)   
Checking out files:  30% (1196/3985)   
Checking out files:  31% (1236/3985)   
Checking out files:  32% (1276/3985)   
Checking out files:  33% (1316/3985)   
Checking out files:  33% (1323/3985)   
Checking out files:  34% (1355/3985)   
Checking out files:  35% (1395/3985)   
Checking out files:  36% (1435/3985)   
Checking out files:  37% (1475/3985)   
Checking out files:  38% (1515/3985)   
Checking out files:  39% (1555/3985)   
Checking out files:  40% (1594/3985)   
Checking out files:  41% (1634/3985)   
Checking out files:  42% (1674/3985)   
Checking out files:  42% (1682/3985)   
Checking out files:  43% (1714/3985)   
Checking out files:  44% (1754/3985)   
Checking out files:  45% (1794/3985)   
Checking out files:  46% (1834/3985)   
Checking out files:  47% (1873/3985)   
Checking out files:  48% (1913/3985)   
Checking out files:  49% (1953/3985)   
Checking out files:  50% (1993/3985)   
Checking out files:  51% (2033/3985)   
Checking out files:  52% (2073/3985)   
Checking out files:  53% (2113/3985)   
Checking out files:  54% (2152/3985)   
Checking out files:  55% (2192/3985)   
Checking out files:  55% (2231/3985)   
Checking out files:  56% (2232/3985)   
Checking out files:  57% (2272/3985)   
Checking out files:  58% (2312/3985)   
Checking out files:  59% (2352/3985)   
Checking out files:  60% (2391/3985)   
Checking out files:  61% (2431/3985)   
Checking out files:  62% (2471/3985)   
Checking out files:  63%