From /pub/scm/linux/kernel/git/torvalds/linux-2.6 bfa274e..7704a8b master -> linus Switched to branch "2.6.25-rc3-mc4" Switched to branch "ide" Context reduced to (2/2) to apply fragment at 273 Switched to branch "2.6.25-rc3-mc4" Already on branch "2.6.25-rc3-mc4" fatal: Not a valid object name: '2.6.25-rc3'. Switched to branch "gregkh-driver" .dotest/patch:1896: space before tab in indent. 0xd3), .dotest/patch:1911: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:1915: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:2125: space before tab in indent. (1 << 14) | (1 << 9) : 0) | .dotest/patch:2128: space before tab in indent. GO7007_SENSOR_CONFIG_MASK), warning: 5 lines add whitespace errors. Switched to branch "2.6.25-rc3-mc4" Already on branch "2.6.25-rc3-mc4" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc3-mc4" Already on branch "2.6.25-rc3-mc4" Switched to branch "gregkh-usb" Switched to branch "2.6.25-rc3-mc4" Already on branch "2.6.25-rc3-mc4" fatal: Not a valid object name: '2.6.25-rc3'. Switched to branch "i2c" Switched to branch "2.6.25-rc3-mc4" Already on branch "2.6.25-rc3-mc4" remote: Counting objects: 32, done. remote: Compressing objects: 4% (1/22) remote: Compressing objects: 9% (2/22) remote: Compressing objects: 13% (3/22) remote: Compressing objects: 18% (4/22) remote: Compressing objects: 22% (5/22) remote: Compressing objects: 27% (6/22) remote: Compressing objects: 31% (7/22) remote: Compressing objects: 36% (8/22) remote: Compressing objects: 40% (9/22) remote: Compressing objects: 45% (10/22) remote: Compressing objects: 50% (11/22) remote: Compressing objects: 54% (12/22) remote: Compressing objects: 59% (13/22) remote: Compressing objects: 63% (14/22) remote: Compressing objects: 68% (15/22) remote: Compressing objects: 72% (16/22) remote: Compressing objects: 77% (17/22) remote: Compressing objects: 81% (18/22) remote: Compressing objects: 86% (19/22) remote: Compressing objects: 90% (20/22) remote: Compressing objects: 95% (21/22) remote: Compressing objects: 100% (22/22) remote: Compressing objects: 100% (22/22), done. remote: Total 22 (delta 19), reused 0 (delta 0) From /pub/scm/linux/kernel/git/avi/kvm fe7c356..fe5d62e master -> kvm remote: Counting objects: 82, done. remote: Compressing objects: 7% (1/14) remote: Compressing objects: 14% (2/14) remote: Compressing objects: 21% (3/14) remote: Compressing objects: 28% (4/14) remote: Compressing objects: 35% (5/14) remote: Compressing objects: 42% (6/14) remote: Compressing objects: 50% (7/14) remote: Compressing objects: 57% (8/14) remote: Compressing objects: 64% (9/14) remote: Compressing objects: 71% (10/14) remote: Compressing objects: 78% (11/14) remote: Compressing objects: 85% (12/14) remote: Compressing objects: 92% (13/14) remote: Compressing objects: 100% (14/14) remote: Compressing objects: 100% (14/14), done. remote: Total 68 (delta 59), reused 57 (delta 54) From /pub/scm/linux/kernel/git/roland/infiniband bfa274e..030f1b2 for-linus -> infiniband-for-linus remote: Counting objects: 269, done. remote: Compressing objects: 1% (1/68) remote: Compressing objects: 2% (2/68) remote: Compressing objects: 4% (3/68) remote: Compressing objects: 5% (4/68) remote: Compressing objects: 7% (5/68) remote: Compressing objects: 8% (6/68) remote: Compressing objects: 10% (7/68) remote: Compressing objects: 11% (8/68) remote: Compressing objects: 13% (9/68) remote: Compressing objects: 14% (10/68) remote: Compressing objects: 16% (11/68) remote: Compressing objects: 17% (12/68) remote: Compressing objects: 19% (13/68) remote: Compressing objects: 20% (14/68) remote: Compressing objects: 22% (15/68) remote: Compressing objects: 23% (16/68) remote: Compressing objects: 25% (17/68) remote: Compressing objects: 26% (18/68) remote: Compressing objects: 27% (19/68) remote: Compressing objects: 29% (20/68) remote: Compressing objects: 30% (21/68) remote: Compressing objects: 32% (22/68) remote: Compressing objects: 33% (23/68) remote: Compressing objects: 35% (24/68) remote: Compressing objects: 36% (25/68) remote: Compressing objects: 38% (26/68) remote: Compressing objects: 39% (27/68) remote: Compressing objects: 41% (28/68) remote: Compressing objects: 42% (29/68) remote: Compressing objects: 44% (30/68) remote: Compressing objects: 45% (31/68) remote: Compressing objects: 47% (32/68) remote: Compressing objects: 48% (33/68) remote: Compressing objects: 50% (34/68) remote: Compressing objects: 51% (35/68) remote: Compressing objects: 52% (36/68) remote: Compressing objects: 54% (37/68) remote: Compressing objects: 55% (38/68) remote: Compressing objects: 57% (39/68) remote: Compressing objects: 58% (40/68) remote: Compressing objects: 60% (41/68) remote: Compressing objects: 61% (42/68) remote: Compressing objects: 63% (43/68) remote: Compressing objects: 64% (44/68) remote: Compressing objects: 66% (45/68) remote: Compressing objects: 67% (46/68) remote: Compressing objects: 69% (47/68) remote: Compressing objects: 70% (48/68) remote: Compressing objects: 72% (49/68) remote: Compressing objects: 73% (50/68) remote: Compressing objects: 75% (51/68) remote: Compressing objects: 76% (52/68) remote: Compressing objects: 77% (53/68) remote: Compressing objects: 79% (54/68) remote: Compressing objects: 80% (55/68) remote: Compressing objects: 82% (56/68) remote: Compressing objects: 83% (57/68) remote: Compressing objects: 85% (58/68) remote: Compressing objects: 86% (59/68) remote: Compressing objects: 88% (60/68) remote: Compressing objects: 89% (61/68) remote: Compressing objects: 91% (62/68) remote: Compressing objects: 92% (63/68) remote: Compressing objects: 94% (64/68) remote: Compressing objects: 95% (65/68) remote: Compressing objects: 97% (66/68) remote: Compressing objects: 98% (67/68) remote: Compressing objects: 100% (68/68) remote: Compressing objects: 100% (68/68), done. remote: Total 191 (delta 157), reused 149 (delta 123) Receiving objects: 0% (1/191) Receiving objects: 1% (2/191) Receiving objects: 2% (4/191) Receiving objects: 3% (6/191) Receiving objects: 4% (8/191) Receiving objects: 5% (10/191) Receiving objects: 6% (12/191) Receiving objects: 7% (14/191) Receiving objects: 8% (16/191) Receiving objects: 9% (18/191) Receiving objects: 10% (20/191) Receiving objects: 11% (22/191) Receiving objects: 12% (23/191) Receiving objects: 13% (25/191) Receiving objects: 14% (27/191) Receiving objects: 15% (29/191) Receiving objects: 16% (31/191) Receiving objects: 17% (33/191) Receiving objects: 18% (35/191) Receiving objects: 19% (37/191) Receiving objects: 20% (39/191) Receiving objects: 21% (41/191) Receiving objects: 22% (43/191) Receiving objects: 23% (44/191) Receiving objects: 24% (46/191) Receiving objects: 25% (48/191) Receiving objects: 26% (50/191) Receiving objects: 27% (52/191) Receiving objects: 28% (54/191) Receiving objects: 29% (56/191) Receiving objects: 30% (58/191) Receiving objects: 31% (60/191) Receiving objects: 32% (62/191) Receiving objects: 33% (64/191) Receiving objects: 34% (65/191) Receiving objects: 35% (67/191) Receiving objects: 36% (69/191) Receiving objects: 37% (71/191) Receiving objects: 38% (73/191) Receiving objects: 39% (75/191) Receiving objects: 40% (77/191) Receiving objects: 41% (79/191) Receiving objects: 42% (81/191) Receiving objects: 43% (83/191) Receiving objects: 44% (85/191) Receiving objects: 45% (86/191) Receiving objects: 46% (88/191) Receiving objects: 47% (90/191) Receiving objects: 48% (92/191) Receiving objects: 49% (94/191) Receiving objects: 50% (96/191) Receiving objects: 51% (98/191) Receiving objects: 52% (100/191) Receiving objects: 53% (102/191) Receiving objects: 54% (104/191) Receiving objects: 55% (106/191) Receiving objects: 56% (107/191) Receiving objects: 57% (109/191) Receiving objects: 58% (111/191) Receiving objects: 59% (113/191) Receiving objects: 60% (115/191) Receiving objects: 61% (117/191) Receiving objects: 62% (119/191) Receiving objects: 63% (121/191) Receiving objects: 64% (123/191) Receiving objects: 65% (125/191) Receiving objects: 66% (127/191) Receiving objects: 67% (128/191) Receiving objects: 68% (130/191) Receiving objects: 69% (132/191) Receiving objects: 70% (134/191) Receiving objects: 71% (136/191) Receiving objects: 72% (138/191) Receiving objects: 73% (140/191) Receiving objects: 74% (142/191) Receiving objects: 75% (144/191) Receiving objects: 76% (146/191) Receiving objects: 77% (148/191) Receiving objects: 78% (149/191) Receiving objects: 79% (151/191) Receiving objects: 80% (153/191) Receiving objects: 81% (155/191) Receiving objects: 82% (157/191) Receiving objects: 83% (159/191) Receiving objects: 84% (161/191) Receiving objects: 85% (163/191) Receiving objects: 86% (165/191) Receiving objects: 87% (167/191) Receiving objects: 88% (169/191) Receiving objects: 89% (170/191) Receiving objects: 90% (172/191) Receiving objects: 91% (174/191) Receiving objects: 92% (176/191) Receiving objects: 93% (178/191) Receiving objects: 94% (180/191) Receiving objects: 95% (182/191) Receiving objects: 96% (184/191) Receiving objects: 97% (186/191) Receiving objects: 98% (188/191) Receiving objects: 99% (190/191) Receiving objects: 100% (191/191) Receiving objects: 100% (191/191), 27.88 KiB, done. Resolving deltas: 0% (1/157) Resolving deltas: 1% (2/157) Resolving deltas: 6% (10/157) Resolving deltas: 7% (11/157) Resolving deltas: 23% (37/157) Resolving deltas: 24% (38/157) Resolving deltas: 25% (40/157) Resolving deltas: 26% (41/157) Resolving deltas: 28% (44/157) Resolving deltas: 29% (46/157) Resolving deltas: 30% (48/157) Resolving deltas: 32% (51/157) Resolving deltas: 33% (53/157) Resolving deltas: 34% (54/157) Resolving deltas: 35% (55/157) Resolving deltas: 36% (57/157) Resolving deltas: 37% (59/157) Resolving deltas: 38% (60/157) Resolving deltas: 39% (62/157) Resolving deltas: 40% (64/157) Resolving deltas: 41% (65/157) Resolving deltas: 42% (66/157) Resolving deltas: 43% (68/157) Resolving deltas: 44% (70/157) Resolving deltas: 45% (71/157) Resolving deltas: 46% (73/157) Resolving deltas: 47% (74/157) Resolving deltas: 48% (76/157) Resolving deltas: 49% (77/157) Resolving deltas: 50% (79/157) Resolving deltas: 51% (81/157) Resolving deltas: 52% (82/157) Resolving deltas: 53% (84/157) Resolving deltas: 54% (85/157) Resolving deltas: 57% (90/157) Resolving deltas: 58% (92/157) Resolving deltas: 59% (93/157) Resolving deltas: 60% (95/157) Resolving deltas: 61% (96/157) Resolving deltas: 62% (98/157) Resolving deltas: 63% (99/157) Resolving deltas: 64% (101/157) Resolving deltas: 65% (103/157) Resolving deltas: 79% (125/157) Resolving deltas: 95% (150/157) Resolving deltas: 96% (151/157) Resolving deltas: 99% (156/157) Resolving deltas: 100% (157/157) Resolving deltas: 100% (157/157), completed with 65 local objects. From /pub/scm/linux/kernel/git/davem/net-2.6 5f2f40a..d9595a7 master -> net remote: Generating pack... remote: Done counting 203 objects. remote: Result has 169 objects. remote: Deltifying 169 objects... remote: 0% (1/169) done remote: 1% (2/169) done remote: 2% (4/169) done remote: 3% (6/169) done remote: 4% (7/169) done remote: 5% (9/169) done remote: 6% (11/169) done remote: 7% (12/169) done remote: 8% (14/169) done remote: 9% (16/169) done remote: 10% (17/169) done remote: 11% (19/169) done remote: 12% (21/169) done remote: 13% (22/169) done remote: 14% (24/169) done remote: 15% (26/169) done remote: 16% (28/169) done remote: 17% (29/169) done remote: 18% (31/169) done remote: 19% (33/169) done remote: 20% (34/169) done remote: 21% (36/169) done remote: 22% (38/169) done remote: 23% (39/169) done remote: 24% (41/169) done remote: 25% (43/169) done remote: 26% (44/169) done remote: 27% (46/169) done remote: 28% (48/169) done remote: 29% (50/169) done remote: 30% (51/169) done remote: 31% (53/169) done remote: 32% (55/169) done remote: 33% (56/169) done remote: 34% (58/169) done remote: 35% (60/169) done remote: 36% (61/169) done remote: 37% (63/169) done remote: 38% (65/169) done remote: 39% (66/169) done remote: 40% (68/169) done remote: 41% (70/169) done remote: 42% (71/169) done remote: 43% (73/169) done remote: 44% (75/169) done remote: 45% (77/169) done remote: 46% (78/169) done remote: 47% (80/169) done remote: 48% (82/169) done remote: 49% (83/169) done remote: 50% (85/169) done remote: 51% (87/169) done remote: 52% (88/169) done remote: 53% (90/169) done remote: 54% (92/169) done remote: 55% (93/169) done remote: 56% (95/169) done remote: 57% (97/169) done remote: 58% (99/169) done remote: 59% (100/169) done remote: 60% (102/169) done remote: 61% (104/169) done remote: 62% (105/169) done remote: 63% (107/169) done remote: 64% (109/169) done remote: 65% (110/169) done remote: remote: 66% (112/169) done remote: 67% (114/169) done remote: 68% (115/169) done remote: 69% (117/169) done remote: 70% (119/169) done remote: 71% (120/169) done remote: 72% (122/169) done remote: 73% (124/169) done remote: 74% (126/169) done remote: 75% (127/169) done remote: 76% (129/169) done remote: 77% (131/169) done remote: 78% (132/169) done remote: 79% (134/169) done remote: 80% (136/169) done remote: 81% (137/169) done remote: 82% (139/169) done remote: 83% (141/169) done remote: 84% (142/169) done remote: 85% (144/169) done remote: 86% (146/169) done remote: 87% (148/169) done remote: 88% (149/169) done remote: 89% (151/169) done remote: 90% (153/169) done remote: 91% (154/169) done remote: 92% (156/169) done remote: 93% (158/169) done remote: 94% (159/169) done remote: 95% (161/169) done remote: 96% (163/169) done remote: 97% (164/169) done remote: 98% (166/169) done remote: 99% (168/169) done remote: 100% (169/169) done remote: Receiving objects: 0% (1/169) Receiving objects: 1% (2/169) Receiving objects: 2% (4/169) Receiving objects: 3% (6/169) Receiving objects: 4% (7/169) Receiving objects: 5% (9/169) Receiving objects: 6% (11/169) Receiving objects: 7% (12/169) Receiving objects: 8% (14/169) Receiving objects: 9% (16/169) Receiving objects: 10% (17/169) Receiving objects: 11% (19/169) Receiving objects: 12% (21/169) Receiving objects: 13% (22/169) Receiving objects: 14% (24/169) Receiving objects: 15% (26/169) Receiving objects: 16% (28/169) remote: Total 169 (delta 144), reused 158 (delta 133) Receiving objects: 17% (29/169) Receiving objects: 18% (31/169) Receiving objects: 19% (33/169) Receiving objects: 20% (34/169) Receiving objects: 21% (36/169) Receiving objects: 22% (38/169) Receiving objects: 23% (39/169) Receiving objects: 24% (41/169) Receiving objects: 25% (43/169) Receiving objects: 26% (44/169) Receiving objects: 27% (46/169) Receiving objects: 28% (48/169) Receiving objects: 29% (50/169) Receiving objects: 30% (51/169) Receiving objects: 31% (53/169) Receiving objects: 32% (55/169) Receiving objects: 33% (56/169) Receiving objects: 34% (58/169) Receiving objects: 35% (60/169) Receiving objects: 36% (61/169) Receiving objects: 37% (63/169) Receiving objects: 38% (65/169) Receiving objects: 39% (66/169) Receiving objects: 40% (68/169) Receiving objects: 41% (70/169) Receiving objects: 42% (71/169) Receiving objects: 43% (73/169) Receiving objects: 44% (75/169) Receiving objects: 45% (77/169) Receiving objects: 46% (78/169) Receiving objects: 47% (80/169) Receiving objects: 48% (82/169) Receiving objects: 49% (83/169) Receiving objects: 50% (85/169) Receiving objects: 51% (87/169) Receiving objects: 52% (88/169) Receiving objects: 53% (90/169) Receiving objects: 54% (92/169) Receiving objects: 55% (93/169) Receiving objects: 56% (95/169) Receiving objects: 57% (97/169) Receiving objects: 58% (99/169) Receiving objects: 59% (100/169) Receiving objects: 60% (102/169) Receiving objects: 61% (104/169) Receiving objects: 62% (105/169) Receiving objects: 63% (107/169) Receiving objects: 64% (109/169) Receiving objects: 65% (110/169) Receiving objects: 66% (112/169) Receiving objects: 67% (114/169) Receiving objects: 68% (115/169) Receiving objects: 69% (117/169) Receiving objects: 70% (119/169) Receiving objects: 71% (120/169) Receiving objects: 72% (122/169) Receiving objects: 73% (124/169) Receiving objects: 74% (126/169) Receiving objects: 75% (127/169) Receiving objects: 76% (129/169) Receiving objects: 77% (131/169) Receiving objects: 78% (132/169) Receiving objects: 79% (134/169) Receiving objects: 80% (136/169) Receiving objects: 81% (137/169) Receiving objects: 82% (139/169) Receiving objects: 83% (141/169) Receiving objects: 84% (142/169) Receiving objects: 85% (144/169) Receiving objects: 86% (146/169) Receiving objects: 87% (148/169) Receiving objects: 88% (149/169) Receiving objects: 89% (151/169) Receiving objects: 90% (153/169) Receiving objects: 91% (154/169) Receiving objects: 92% (156/169) Receiving objects: 93% (158/169) Receiving objects: 94% (159/169) Receiving objects: 95% (161/169) Receiving objects: 96% (163/169) Receiving objects: 97% (164/169) Receiving objects: 98% (166/169) Receiving objects: 99% (168/169) Receiving objects: 100% (169/169) Receiving objects: 100% (169/169), 27.54 KiB, done. Resolving deltas: 0% (1/144) Resolving deltas: 2% (3/144) Resolving deltas: 3% (5/144) Resolving deltas: 4% (6/144) Resolving deltas: 6% (9/144) Resolving deltas: 7% (11/144) Resolving deltas: 9% (14/144) Resolving deltas: 13% (20/144) Resolving deltas: 20% (30/144) Resolving deltas: 21% (31/144) Resolving deltas: 27% (40/144) Resolving deltas: 29% (42/144) Resolving deltas: 30% (44/144) Resolving deltas: 33% (48/144) Resolving deltas: 34% (49/144) Resolving deltas: 40% (59/144) Resolving deltas: 43% (63/144) Resolving deltas: 44% (64/144) Resolving deltas: 54% (79/144) Resolving deltas: 60% (87/144) Resolving deltas: 65% (95/144) Resolving deltas: 72% (104/144) Resolving deltas: 79% (114/144) Resolving deltas: 86% (125/144) Resolving deltas: 95% (137/144) Resolving deltas: 96% (139/144) Resolving deltas: 97% (140/144) Resolving deltas: 98% (142/144) Resolving deltas: 99% (143/144) Resolving deltas: 100% (144/144) Resolving deltas: 100% (144/144), completed with 31 local objects. From git://git.linux-nfs.org/projects/trondmy/nfs-2.6 cbc2005..b3d41af6 linux-next -> nfs remote: Counting objects: 1 remote: Counting objects: 13, done. remote: Compressing objects: 14% (1/7) remote: Compressing objects: 28% (2/7) remote: Compressing objects: 42% (3/7) remote: Compressing objects: 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 7 (delta 6), reused 0 (delta 0) From /pub/scm/linux/kernel/git/lethal/sh-2.6 96de1a8..b2d7c7f master -> sh fatal: Not a valid object name: '2.6.25-rc3'. Switched to branch "doc" Switched to branch "2.6.25-rc3-mc4" Already on branch "2.6.25-rc3-mc4" Already on branch "2.6.25-rc3-mc4" rivers/ide/legacy/ide-4drives.c delete mode 100644 include/linux/hdsmart.h ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core/. gregkh-driver ## building file list ... done ./ README debugfs-fix-sparse-warnings.patch driver-core-memory-semaphore-to-mutex.patch driver-core-numactl-interleave-all-doesn-t-works-on-memoryless-node.patch driver-core-register_memory-unregister_memory-clean-ups-and-bugfix.patch firmware-clean-up-samples-for-coding-style-issues.patch firmware-move-firmware_class-from-documentation-to-samples.patch kobject-catch-kobjects-that-are-not-initialized.patch kobject-properly-initialize-ksets.patch net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch pnp-add-all-pnp-card-device-id-s-as-individual-aliases.patch power_state-remove-it-from-driver-core.patch put_device-might_sleep.patch series sysfs-crash-debugging.patch sysfs-small-header-file-cleanup-for-sysfs-n.patch uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch uio-kconfig-improvements.patch uio-mark-pci_device_id-hilscher_pci_ids-__devinitdata.patch uio-remove-needless-pci_device_id-definition-from-uio_cif.c.patch video-add-the-go7007-driver.patch warn-when-statically-allocated-kobjects-are-used.patch sent 314722 bytes received 510 bytes 630464.00 bytes/sec total size is 312036 speedup is 0.99 Using base 2.6.25-rc3 kobject-properly-initialize-ksets.patch kobject-catch-kobjects-that-are-not-initialized.patch uio-kconfig-improvements.patch uio-mark-pci_device_id-hilscher_pci_ids-__devinitdata.patch uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch uio-remove-needless-pci_device_id-definition-from-uio_cif.c.patch debugfs-fix-sparse-warnings.patch driver-core-memory-semaphore-to-mutex.patch driver-core-register_memory-unregister_memory-clean-ups-and-bugfix.patch driver-core-numactl-interleave-all-doesn-t-works-on-memoryless-node.patch sysfs-small-header-file-cleanup-for-sysfs-n.patch firmware-move-firmware_class-from-documentation-to-samples.patch firmware-clean-up-samples-for-coding-style-issues.patch pnp-add-all-pnp-card-device-id-s-as-individual-aliases.patch power_state-remove-it-from-driver-core.patch net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch put_device-might_sleep.patch warn-when-statically-allocated-kobjects-are-used.patch sysfs-crash-debugging.patch video-add-the-go7007-driver.patch ## # merge gregkh-driver ## Merge made by recursive. arch/arm/Kconfig | 2 + arch/x86/kernel/traps_32.c | 1 + arch/x86/kernel/traps_64.c | 1 + drivers/base/core.c | 1 + drivers/base/memory.c | 29 +- drivers/base/node.c | 7 +- drivers/base/power/main.c | 5 - drivers/media/video/Kconfig | 1 + drivers/media/video/Makefile | 2 + drivers/media/video/go7007/Kconfig | 14 + drivers/media/video/go7007/Makefile | 17 + drivers/media/video/go7007/go7007-driver.c | 693 +++++++++ drivers/media/video/go7007/go7007-fw.c | 1643 ++++++++++++++++++++ drivers/media/video/go7007/go7007-i2c.c | 309 ++++ drivers/media/video/go7007/go7007-priv.h | 279 ++++ drivers/media/video/go7007/go7007-usb.c | 1229 +++++++++++++++ drivers/media/video/go7007/go7007-v4l2.c | 1516 ++++++++++++++++++ drivers/media/video/go7007/go7007.h | 120 ++ drivers/media/video/go7007/saa7134-go7007.c | 484 ++++++ drivers/media/video/go7007/snd-go7007.c | 315 ++++ drivers/media/video/go7007/wis-i2c.h | 55 + drivers/media/video/go7007/wis-ov7640.c | 146 ++ drivers/media/video/go7007/wis-saa7113.c | 378 +++++ drivers/media/video/go7007/wis-saa7115.c | 507 ++++++ drivers/media/video/go7007/wis-sony-tuner.c | 757 +++++++++ drivers/media/video/go7007/wis-tw2804.c | 383 +++++ drivers/media/video/go7007/wis-tw9903.c | 378 +++++ drivers/media/video/go7007/wis-uda1342.c | 136 ++ drivers/net/phy/phy_device.c | 8 +- drivers/uio/Kconfig | 10 +- drivers/uio/uio_cif.c | 6 +- fs/debugfs/inode.c | 4 - fs/sysfs/file.c | 13 + fs/sysfs/mount.c | 2 +- fs/sysfs/sysfs.h | 1 + include/linux/debugfs.h | 5 + include/linux/init.h | 1 + include/linux/memory.h | 5 +- include/linux/sysfs.h | 14 +- init/main.c | 9 + lib/kobject.c | 72 +- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 +- 45 files changed, 9580 insertions(+), 125 deletions(-) create mode 100644 drivers/media/video/go7007/Kconfig create mode 100644 drivers/media/video/go7007/Makefile create mode 100644 drivers/media/video/go7007/go7007-driver.c create mode 100644 drivers/media/video/go7007/go7007-fw.c create mode 100644 drivers/media/video/go7007/go7007-i2c.c create mode 100644 drivers/media/video/go7007/go7007-priv.h create mode 100644 drivers/media/video/go7007/go7007-usb.c create mode 100644 drivers/media/video/go7007/go7007-v4l2.c create mode 100644 drivers/media/video/go7007/go7007.h create mode 100644 drivers/media/video/go7007/saa7134-go7007.c create mode 100644 drivers/media/video/go7007/snd-go7007.c create mode 100644 drivers/media/video/go7007/wis-i2c.h create mode 100644 drivers/media/video/go7007/wis-ov7640.c create mode 100644 drivers/media/video/go7007/wis-saa7113.c create mode 100644 drivers/media/video/go7007/wis-saa7115.c create mode 100644 drivers/media/video/go7007/wis-sony-tuner.c create mode 100644 drivers/media/video/go7007/wis-tw2804.c create mode 100644 drivers/media/video/go7007/wis-tw9903.c create mode 100644 drivers/media/video/go7007/wis-uda1342.c rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/. gregkh-pci base gregkh-driver ## building file list ... done ./ README ide-remove-ide-reverse-ide-core.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-clean-up-search.c-a-lot.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-if-0-pci_assign_resource_fixed.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-remove-global-list-of-pci-devices.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch pci-remove-pci_get_device_reverse.patch pci-remove-pcibios_fixup_ghosts.patch series sent 63829 bytes received 466 bytes 128590.00 bytes/sec total size is 61517 speedup is 0.96 Using base gregkh-driver pci-if-0-pci_assign_resource_fixed.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch ide-remove-ide-reverse-ide-core.patch pci-remove-pci_get_device_reverse.patch pci-clean-up-search.c-a-lot.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-remove-pcibios_fixup_ghosts.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-global-list-of-pci-devices.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-remove-pci-routeirq-noise-from-dmesg.patch ## # merge gregkh-pci ## Auto-merged Documentation/ide.txt Auto-merged drivers/ide/Kconfig Auto-merged drivers/ide/ide.c Auto-merged include/linux/ide.h Merge made by recursive. Documentation/ide.txt | 2 - Documentation/kernel-parameters.txt | 6 +- arch/frv/mb93090-mb00/pci-frv.h | 2 - arch/frv/mb93090-mb00/pci-vdk.c | 53 ----- arch/mn10300/unit-asb2305/pci-asb2305.h | 2 - arch/powerpc/platforms/pseries/pci_dlpar.c | 7 +- arch/sh/drivers/pci/pci-sh4.h | 2 - arch/x86/kernel/pci-calgary_64.c | 3 +- arch/x86/pci/acpi.c | 11 +- arch/x86/pci/common.c | 61 ------ arch/x86/pci/pcbios.c | 72 ------- arch/x86/pci/pci.h | 3 - drivers/ide/Kconfig | 9 +- drivers/ide/ide-scan-pci.c | 9 +- drivers/ide/ide.c | 12 - drivers/parisc/dino.c | 1 - drivers/pci/bus.c | 15 +- drivers/pci/hotplug/Kconfig | 4 +- drivers/pci/hotplug/cpcihp_generic.c | 8 +- drivers/pci/pcie/aer/aerdrv_acpi.c | 3 + drivers/pci/pcie/aer/aerdrv_core.c | 3 +- drivers/pci/probe.c | 60 ++---- drivers/pci/remove.c | 10 +- drivers/pci/search.c | 313 +++++++++++----------------- drivers/pci/setup-res.c | 2 +- include/asm-sh/mpc1211/pci.h | 2 - include/linux/aer.h | 5 - include/linux/ide.h | 1 - include/linux/pci.h | 21 +-- 29 files changed, 175 insertions(+), 527 deletions(-) ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb/. gregkh-usb base gregkh-pci ## building file list ... done ./ README series usb-add-sensoray-2255-v4l-driver.patch usb-add-usb-serial-spcp8x5-driver.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-minor-cleanups.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-ehci-tolerates-some-buggy-devices.patch usb-ftdi_sio-note-missing-locking.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-gotemp.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-libusual-locking-cleanup.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-microtek-remove-unused-semaphore.patch usb-minor-ehci-xitd-simplifications.patch usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-cp_mutex-to-mutex.diff usb-ohci-port-reset-paranoia-timeout.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch sent 3411047 bytes received 818 bytes 6823730.00 bytes/sec total size is 3406506 speedup is 1.00 Using base gregkh-pci usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-microtek-remove-unused-semaphore.patch usb-libusual-locking-cleanup.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-minor-cleanups.patch usb-ohci-port-reset-paranoia-timeout.patch usb-ehci-tolerates-some-buggy-devices.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-misc-auerswald-cp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-minor-ehci-xitd-simplifications.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-ftdi_sio-note-missing-locking.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-add-usb-serial-spcp8x5-driver.patch usb-gotemp.patch usb-add-sensoray-2255-v4l-driver.patch ## # merge gregkh-usb ## Merge made by recursive. drivers/usb/atm/usbatm.c | 27 +- drivers/usb/atm/usbatm.h | 2 +- drivers/usb/core/config.c | 17 + drivers/usb/core/hcd.h | 2 +- drivers/usb/core/hub.h | 8 +- drivers/usb/gadget/m66592-udc.h | 2 +- drivers/usb/gadget/serial.c | 3 +- drivers/usb/host/ehci-au1xxx.c | 5 +- drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/ehci-fsl.c | 9 +- drivers/usb/host/ehci-hcd.c | 56 +- drivers/usb/host/ehci-hub.c | 2 +- drivers/usb/host/ehci-ixp4xx.c | 3 +- drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-q.c | 16 +- drivers/usb/host/ehci-sched.c | 44 +- drivers/usb/host/ohci-hub.c | 24 +- drivers/usb/host/ohci-sm501.c | 5 +- drivers/usb/image/Kconfig | 9 + drivers/usb/image/Makefile | 1 + drivers/usb/image/f2255usb.h |40334 +++++++++++++++++++++++++++++++++ drivers/usb/image/microtek.c | 1 - drivers/usb/image/microtek.h | 1 - drivers/usb/image/s2255drv.c | 2804 +++ drivers/usb/misc/Kconfig | 9 + drivers/usb/misc/Makefile | 1 + drivers/usb/misc/auerswald.c | 115 +- drivers/usb/misc/gotemp.c | 295 + drivers/usb/serial/Kconfig | 10 + drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/cypress_m8.c | 284 +- drivers/usb/serial/ftdi_sio.c | 4 +- drivers/usb/serial/io_ti.c | 17 +- drivers/usb/serial/iuu_phoenix.c | 18 +- drivers/usb/serial/kobil_sct.c | 15 +- drivers/usb/serial/mos7840.c | 1 + drivers/usb/serial/option.c | 1 + drivers/usb/serial/spcp8x5.c | 1079 + drivers/usb/serial/ti_usb_3410_5052.c | 9 + drivers/usb/serial/usb-serial.c | 11 +- drivers/usb/storage/Kconfig | 2 +- drivers/usb/storage/libusual.c | 14 +- include/linux/usb.h | 177 +- include/linux/usb/ch9.h | 14 +- 44 files changed, 45078 insertions(+), 383 deletions(-) create mode 100644 drivers/usb/image/f2255usb.h create mode 100644 drivers/usb/image/s2255drv.c create mode 100644 drivers/usb/misc/gotemp.c create mode 100644 drivers/usb/serial/spcp8x5.c ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-patches agp ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/perex/alsa.git linus alsa ## Auto-merged sound/pci/hda/hda_codec.c Auto-merged sound/pci/hda/hda_intel.c Auto-merged sound/pci/hda/patch_conexant.c Auto-merged sound/pci/hda/patch_realtek.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 1 + sound/core/oss/mixer_oss.c | 2 + sound/isa/sb/sb8_main.c | 2 +- sound/pci/hda/hda_codec.c | 59 ++++++++++- sound/pci/hda/hda_codec.h | 12 ++- sound/pci/hda/hda_intel.c | 89 ++++++++------- sound/pci/hda/patch_analog.c | 9 +- sound/pci/hda/patch_atihdmi.c | 6 + sound/pci/hda/patch_cmedia.c | 1 + sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 130 ++++++++++++++-------- sound/pci/hda/patch_si3054.c | 2 +- sound/pci/hda/patch_sigmatel.c | 1 + sound/pci/hda/patch_via.c | 1 + sound/pci/ice1712/hoontech.c | 21 +++- sound/pci/ice1712/revo.c | 51 +++++----- sound/pci/intel8x0.c | 6 + sound/pci/oxygen/hifier.c | 1 + sound/pci/oxygen/virtuoso.c | 1 + sound/usb/caiaq/caiaq-control.c | 4 +- sound/usb/usbaudio.c | 38 ++++++- 21 files changed, 307 insertions(+), 131 deletions(-) ## # skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## SKIPPING: skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## # git /pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git avr32-arch avr32 ## Merge made by recursive. arch/avr32/boards/atstk1000/atstk1004.c | 2 +- arch/avr32/kernel/process.c | 3 + arch/avr32/kernel/semaphore.c | 124 +++++++++++++++--------------- arch/avr32/kernel/time.c | 45 ++--------- arch/avr32/mach-at32ap/at32ap700x.c | 7 ++- arch/avr32/mm/fault.c | 2 + drivers/char/keyboard.c | 3 +- include/asm-avr32/arch-at32ap/board.h | 5 +- include/asm-avr32/page.h | 8 +- include/asm-avr32/pgtable.h | 1 + include/asm-avr32/processor.h | 2 +- 11 files changed, 93 insertions(+), 109 deletions(-) ## # git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master cifs ## Merge made by recursive. fs/cifs/CHANGES | 4 +- fs/cifs/README | 2 +- fs/cifs/cifs_debug.c | 17 ++- fs/cifs/cifs_debug.h | 9 +- fs/cifs/cifs_dfs_ref.c | 2 +- fs/cifs/cifs_spnego.c | 2 +- fs/cifs/cifs_unicode.c | 4 +- fs/cifs/cifs_unicode.h | 9 +- fs/cifs/cifsacl.c | 57 ++----- fs/cifs/cifsfs.c | 15 +-- fs/cifs/cifsglob.h | 2 +- fs/cifs/cifsproto.h | 22 ++- fs/cifs/cifssmb.c | 218 ++++++++------------------- fs/cifs/connect.c | 50 +++++- fs/cifs/dir.c | 20 +-- fs/cifs/dns_resolve.h | 2 +- fs/cifs/fcntl.c | 6 +- fs/cifs/file.c | 33 ++--- fs/cifs/inode.c | 399 ++++++++++++++++++------------------------------ fs/cifs/ioctl.c | 2 +- fs/cifs/md4.c | 4 +- fs/cifs/md5.c | 9 +- fs/cifs/misc.c | 14 +- fs/cifs/netmisc.c | 23 ++-- fs/cifs/readdir.c | 54 +++---- fs/cifs/sess.c | 4 - fs/cifs/smbdes.c | 22 ++-- fs/cifs/transport.c | 11 +- fs/cifs/xattr.c | 9 +- 29 files changed, 410 insertions(+), 615 deletions(-) ## # git /pub/scm/linux/kernel/git/davej/cpufreq.git master cpufreq ## Auto-merged drivers/cpufreq/cpufreq.c Merge made by recursive. arch/x86/kernel/cpu/cpufreq/e_powersaver.c | 2 + drivers/cpufreq/cpufreq.c | 109 +++++++++++++--------------- 2 files changed, 54 insertions(+), 57 deletions(-) ## # git /pub/scm/linux/kernel/git/agk/linux-2.6-dm.git master dm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/paulus/powerpc.git master powerpc ## Auto-merged arch/powerpc/platforms/powermac/setup.c Merge made by recursive. arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/btext.c | 3 +- arch/powerpc/kernel/crash.c | 3 +- arch/powerpc/kernel/crash_dump.c | 3 +- arch/powerpc/kernel/head_32.S | 17 ---- arch/powerpc/kernel/machine_kexec.c | 3 +- arch/powerpc/kernel/prom.c | 2 +- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 2 +- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/vdso.c | 3 +- arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/hash_utils_64.c | 26 ++++++- arch/powerpc/mm/init_32.c | 2 +- arch/powerpc/mm/init_64.c | 2 +- arch/powerpc/mm/mem.c | 2 +- arch/powerpc/mm/numa.c | 3 +- arch/powerpc/mm/ppc_mmu_32.c | 2 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +-- arch/powerpc/platforms/cell/iommu.c | 2 +- arch/powerpc/platforms/maple/setup.c | 2 +- arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/ps3/htab.c | 3 +- arch/powerpc/platforms/ps3/mm.c | 3 +- arch/powerpc/platforms/ps3/os-area.c | 3 +- arch/powerpc/platforms/pseries/lpar.c | 15 ++++ arch/powerpc/sysdev/dart_iommu.c | 2 +- arch/powerpc/sysdev/mpic.c | 32 ++++--- arch/ppc/8xx_io/commproc.c | 2 +- arch/ppc/kernel/head.S | 17 ---- arch/sparc64/Kconfig | 1 + include/asm-powerpc/abs_addr.h | 3 +- include/asm-powerpc/cputhreads.h | 2 +- include/asm-powerpc/lmb.h | 82 ++---------------- include/asm-powerpc/machdep.h | 2 + include/asm-powerpc/sparsemem.h | 1 + include/asm-sparc64/lmb.h | 10 ++ include/linux/lmb.h | 83 ++++++++++++++++++ lib/Kconfig | 3 + lib/Makefile | 2 + {arch/powerpc/mm => lib}/lmb.c | 141 +++++++++++++++++-------------- 42 files changed, 285 insertions(+), 219 deletions(-) create mode 100644 include/asm-sparc64/lmb.h create mode 100644 include/linux/lmb.h rename {arch/powerpc/mm => lib}/lmb.c (68%) ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git master drm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mchehab/v4l-dvb.git devel dvb ## Auto-merged drivers/media/video/Kconfig Auto-merged drivers/media/video/Makefile Merge made by recursive. Documentation/video4linux/CARDLIST.cx88 | 6 + Documentation/video4linux/CARDLIST.saa7134 | 7 + arch/arm/mach-pxa/devices.c | 32 + arch/arm/mach-pxa/pcm990-baseboard.c | 86 ++ drivers/media/Kconfig | 7 +- drivers/media/common/ir-functions.c | 2 +- drivers/media/common/saa7146_core.c | 8 +- drivers/media/common/saa7146_fops.c | 2 +- drivers/media/common/saa7146_vbi.c | 4 +- drivers/media/common/saa7146_video.c | 4 +- drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.c | 2 +- drivers/media/dvb/frontends/Kconfig | 7 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/cx22702.c | 2 +- drivers/media/dvb/frontends/dvb-pll.c | 2 +- drivers/media/dvb/frontends/isl6405.c | 164 ++++ drivers/media/dvb/frontends/isl6405.h | 74 ++ drivers/media/dvb/frontends/lgdt330x.c | 2 +- drivers/media/dvb/frontends/nxt6000.c | 2 +- drivers/media/dvb/frontends/s5h1409.c | 2 +- drivers/media/dvb/frontends/s5h1420.c | 2 +- drivers/media/dvb/frontends/sp8870.c | 12 +- drivers/media/dvb/frontends/tda10086.c | 2 +- drivers/media/dvb/frontends/tda18271-common.c | 19 +- drivers/media/dvb/frontends/tda18271-fe.c | 230 ++---- drivers/media/dvb/frontends/tda18271-priv.h | 7 +- drivers/media/dvb/frontends/tda826x.c | 2 +- drivers/media/dvb/frontends/tda827x.c | 8 +- drivers/media/dvb/frontends/ves1x93.c | 2 +- drivers/media/dvb/frontends/xc5000.c | 2 +- drivers/media/dvb/frontends/zl10353.c | 2 +- drivers/media/dvb/ttpci/budget-ci.c | 2 +- drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 4 +- drivers/media/radio/miropcm20-rds.c | 2 +- drivers/media/radio/radio-cadet.c | 10 +- drivers/media/radio/radio-typhoon.c | 2 +- drivers/media/video/Kconfig | 47 +- drivers/media/video/Makefile | 8 +- drivers/media/video/adv7170.c | 2 +- drivers/media/video/adv7175.c | 2 +- drivers/media/video/arv.c | 4 +- drivers/media/video/bt819.c | 2 +- drivers/media/video/bt856.c | 2 +- drivers/media/video/bt8xx/bttv-driver.c | 17 +- drivers/media/video/bt8xx/bttv-vbi.c | 2 +- drivers/media/video/bw-qcam.c | 4 +- drivers/media/video/c-qcam.c | 4 +- drivers/media/video/cafe_ccic.c | 4 +- drivers/media/video/cpia2/cpia2_core.c | 4 +- drivers/media/video/cpia2/cpia2_usb.c | 2 +- drivers/media/video/cx23885/cx23885-dvb.c | 2 +- drivers/media/video/cx23885/cx23885-i2c.c | 2 +- drivers/media/video/cx23885/cx23885-video.c | 4 +- drivers/media/video/cx25840/cx25840-firmware.c | 11 +- drivers/media/video/cx88/cx88-alsa.c | 8 +- drivers/media/video/cx88/cx88-blackbird.c | 6 +- drivers/media/video/cx88/cx88-cards.c | 426 ++++++++- drivers/media/video/cx88/cx88-core.c | 6 +- drivers/media/video/cx88/cx88-dvb.c | 158 ++++- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 2 +- drivers/media/video/cx88/cx88-mpeg.c | 4 +- drivers/media/video/cx88/cx88-tvaudio.c | 6 +- drivers/media/video/cx88/cx88-vbi.c | 2 +- drivers/media/video/cx88/cx88-video.c | 18 +- drivers/media/video/cx88/cx88.h | 6 + drivers/media/video/dabfirmware.h | 7 + drivers/media/video/dpc7146.c | 4 +- drivers/media/video/em28xx/em28xx-core.c | 6 +- drivers/media/video/em28xx/em28xx-i2c.c | 4 +- drivers/media/video/em28xx/em28xx-video.c | 2 +- drivers/media/video/et61x251/et61x251_core.c | 2 +- drivers/media/video/hexium_gemini.c | 4 +- drivers/media/video/hexium_orion.c | 4 +- drivers/media/video/ir-kbd-i2c.c | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 11 +- drivers/media/video/ivtv/ivtv-driver.h | 2 + drivers/media/video/ivtv/ivtv-firmware.c | 8 +- drivers/media/video/ivtv/ivtv-ioctl.c | 36 +- drivers/media/video/ivtv/ivtv-irq.c | 25 +- drivers/media/video/ivtv/ivtv-yuv.c | 38 +- drivers/media/video/meye.c | 12 +- drivers/media/video/mt20xx.c | 7 +- drivers/media/video/mt9m001.c | 703 +++++++++++++++ drivers/media/video/mt9v022.c | 819 +++++++++++++++++ drivers/media/video/mxb.c | 4 +- drivers/media/video/pms.c | 4 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- drivers/media/video/pwc/pwc-if.c | 8 +- drivers/media/video/pxa_camera.c | 915 +++++++++++++++++++ drivers/media/video/saa6588.c | 8 +- drivers/media/video/saa7110.c | 2 +- drivers/media/video/saa7111.c | 2 +- drivers/media/video/saa7114.c | 2 +- drivers/media/video/saa7115.c | 2 +- drivers/media/video/saa711x.c | 2 +- drivers/media/video/saa7134/saa7134-alsa.c | 12 +- drivers/media/video/saa7134/saa7134-cards.c | 364 +++++++- drivers/media/video/saa7134/saa7134-core.c | 48 +- drivers/media/video/saa7134/saa7134-dvb.c | 122 +++- drivers/media/video/saa7134/saa7134-empress.c | 6 +- drivers/media/video/saa7134/saa7134-i2c.c | 4 +- drivers/media/video/saa7134/saa7134-input.c | 6 +- drivers/media/video/saa7134/saa7134-ts.c | 2 +- drivers/media/video/saa7134/saa7134-tvaudio.c | 6 +- drivers/media/video/saa7134/saa7134-vbi.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 10 +- drivers/media/video/saa7134/saa7134.h | 16 +- drivers/media/video/saa7185.c | 2 +- drivers/media/video/se401.c | 2 +- drivers/media/video/sn9c102/sn9c102_core.c | 4 +- drivers/media/video/soc_camera.c | 973 +++++++++++++++++++++ drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/stradis.c | 4 +- drivers/media/video/stv680.c | 9 +- drivers/media/video/tda8290.c | 3 +- drivers/media/video/tda9840.c | 2 +- drivers/media/video/tda9887.c | 3 +- drivers/media/video/tea5761.c | 7 +- drivers/media/video/tea5767.c | 34 +- drivers/media/video/tea6415c.c | 2 +- drivers/media/video/tea6420.c | 2 +- drivers/media/video/tuner-core.c | 44 +- drivers/media/video/tuner-i2c.h | 118 +++- drivers/media/video/tuner-simple.c | 513 +++++++----- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 6 + drivers/media/video/tuner-xc2028.c | 18 +- drivers/media/video/tvaudio.c | 8 +- drivers/media/video/tveeprom.c | 103 --- drivers/media/video/tvp5150.c | 2 +- drivers/media/video/usbvideo/ibmcam.c | 2 +- drivers/media/video/usbvideo/konicawc.c | 2 +- drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- drivers/media/video/usbvideo/ultracam.c | 4 +- drivers/media/video/usbvideo/usbvideo.c | 2 +- drivers/media/video/usbvision/usbvision-core.c | 14 +- drivers/media/video/usbvision/usbvision-i2c.c | 2 +- drivers/media/video/usbvision/usbvision-video.c | 4 +- drivers/media/video/v4l1-compat.c | 4 +- drivers/media/video/videobuf-dma-sg.c | 119 ++-- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 4 +- drivers/media/video/videocodec.c | 4 +- drivers/media/video/vino.c | 10 +- drivers/media/video/vpx3220.c | 2 +- drivers/media/video/w9966.c | 4 +- drivers/media/video/w9968cf.c | 2 +- drivers/media/video/zc0301/zc0301_core.c | 2 +- drivers/media/video/zoran_card.c | 6 +- drivers/media/video/zoran_device.c | 5 +- drivers/media/video/zoran_driver.c | 2 +- drivers/media/video/zr36016.c | 5 +- drivers/media/video/zr36050.c | 5 +- drivers/media/video/zr36060.c | 6 +- drivers/media/video/zr364xx.c | 4 +- include/asm-arm/arch-pxa/camera.h | 48 + include/asm-arm/arch-pxa/pxa-regs.h | 147 +++- include/linux/meye.h | 2 +- include/linux/videodev2.h | 52 +- include/media/soc_camera.h | 147 ++++ include/media/v4l2-chip-ident.h | 6 + include/media/videobuf-dma-sg.h | 14 +- 166 files changed, 6165 insertions(+), 1091 deletions(-) create mode 100644 drivers/media/dvb/frontends/isl6405.c create mode 100644 drivers/media/dvb/frontends/isl6405.h create mode 100644 drivers/media/video/mt9m001.c create mode 100644 drivers/media/video/mt9v022.c create mode 100644 drivers/media/video/pxa_camera.c create mode 100644 drivers/media/video/soc_camera.c create mode 100644 include/asm-arm/arch-pxa/camera.h create mode 100644 include/media/soc_camera.h ## # quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## Using base 2.6.25-rc3 i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.patch i2c-ibm_iic-01-change-log-levels.patch i2c-ibm_iic-02-of-platform.patch i2c-isp1301_omap-convert-to-new-style-1.patch ## # merge i2c ## Removed drivers/i2c/algos/i2c-algo-pca.h Merge made by recursive. drivers/i2c/algos/Kconfig | 39 +------- drivers/i2c/algos/i2c-algo-pca.c | 125 ++++++++++++------------ drivers/i2c/algos/i2c-algo-pca.h | 26 ----- drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-ibm_iic.c | 197 ++++++++++++++++++++++++++++++++++++- drivers/i2c/busses/i2c-pca-isa.c | 53 ++++------- drivers/i2c/chips/isp1301_omap.c | 59 ++++++------ include/linux/i2c-algo-pca.h | 37 ++++++- 8 files changed, 341 insertions(+), 197 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h ## # git /pub/scm/linux/kernel/git/jikos/hid.git upstream hid-upstream ## Merge made by recursive. drivers/hid/usbhid/hid-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ## # git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git master hrt ## Merge made by recursive. kernel/time/ntp.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) ## # git /pub/scm/linux/kernel/git/dtor/input.git for-linus input ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git master input-devel ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus jfs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/sam/kbuild.git master kbuild ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/avi/kvm.git master kvm ## Auto-merged arch/x86/kernel/setup_64.c Removed arch/x86/kvm/segment_descriptor.h Merge made by recursive. arch/x86/Kconfig | 10 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/kvmclock.c | 161 ++++++++++++++ arch/x86/kernel/setup_32.c | 5 + arch/x86/kernel/setup_64.c | 5 + arch/x86/kvm/kvm_svm.h | 2 + arch/x86/kvm/lapic.c | 4 + arch/x86/kvm/mmu.c | 419 +++++++++++++++++++++++++++++++------ arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 74 ++++--- arch/x86/kvm/segment_descriptor.h | 29 --- arch/x86/kvm/svm.c | 235 +++++++++++++++++---- arch/x86/kvm/vmx.c | 139 +++++++++--- arch/x86/kvm/vmx.h | 10 +- arch/x86/kvm/x86.c | 378 +++++++++++++++++++++++---------- arch/x86/kvm/x86_emulate.c | 256 +++++++++++++---------- include/asm-x86/kvm_host.h | 39 +++- include/asm-x86/kvm_para.h | 25 +++ include/linux/kvm.h | 7 +- include/linux/kvm_host.h | 15 ++- virt/kvm/ioapic.c | 8 + virt/kvm/kvm_main.c | 96 +++++++-- 22 files changed, 1466 insertions(+), 458 deletions(-) create mode 100644 arch/x86/kernel/kvmclock.c delete mode 100644 arch/x86/kvm/segment_descriptor.h ## # git git://git.o-hand.com/linux-rpurdie-leds for-linus leds ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block for-linus block-for-linus ## Merge made by recursive. Documentation/DocBook/kernel-api.tmpl | 2 + block/blk-core.c | 2 + block/blk-settings.c | 1 - drivers/block/cciss.c | 257 ++++++++++++++++++++------------- drivers/block/cciss_scsi.c | 10 +- fs/splice.c | 12 +- 6 files changed, 174 insertions(+), 110 deletions(-) ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-upstream-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-linus infiniband-for-linus ## Merge made by recursive. MAINTAINERS | 2 ++ drivers/infiniband/hw/cxgb3/iwch_mem.c | 10 ++-------- drivers/infiniband/hw/nes/nes.c | 2 +- drivers/infiniband/hw/nes/nes.h | 15 +++++++++++++++ drivers/infiniband/hw/nes/nes_cm.c | 15 +++++++++------ drivers/infiniband/hw/nes/nes_hw.c | 13 +++++-------- drivers/infiniband/hw/nes/nes_hw.h | 2 +- drivers/infiniband/hw/nes/nes_verbs.c | 10 ++++------ 8 files changed, 39 insertions(+), 30 deletions(-) ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-2.6.26 infiniband ## Merge made by recursive. drivers/infiniband/hw/amso1100/c2.c | 10 +++++----- drivers/infiniband/hw/cxgb3/iwch.h | 2 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 3 ++- drivers/infiniband/hw/ipath/ipath_init_chip.c | 8 ++++---- drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- drivers/infiniband/hw/mthca/mthca_dev.h | 10 +++++----- drivers/infiniband/hw/mthca/mthca_eq.c | 4 ++-- drivers/infiniband/hw/mthca/mthca_mad.c | 2 +- drivers/infiniband/hw/mthca/mthca_memfree.c | 2 +- drivers/infiniband/hw/mthca/mthca_provider.c | 2 +- drivers/net/mlx4/cmd.c | 3 ++- include/rdma/ib_verbs.h | 2 +- 13 files changed, 27 insertions(+), 25 deletions(-) ## # git /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release acpi ## Already up-to-date. ## # git /home/rmk/linux-2.6-arm.git for-linus arm-for-linus ## Already up-to-date. ## # git /home/rmk/linux-2.6-arm.git master arm ## Auto-merged arch/arm/Kconfig Merge made by recursive. arch/arm/Kconfig | 3 ++- include/asm-arm/kexec.h | 2 +- include/asm-arm/unaligned.h | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus ieee1394-for-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git master ieee1394 ## Already up-to-date. ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-for-linus iop ## Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 7 + crypto/async_tx/async_memcpy.c | 6 +- crypto/async_tx/async_memset.c | 6 +- crypto/async_tx/async_tx.c | 203 +++++-- crypto/async_tx/async_xor.c | 12 +- drivers/dma/Kconfig | 19 +- drivers/dma/Makefile | 1 + drivers/dma/dmaengine.c | 3 - drivers/dma/fsldma.c | 1060 ++++++++++++++++++++++++++++++++ drivers/dma/fsldma.h | 189 ++++++ drivers/dma/ioat_dma.c | 12 - drivers/dma/iop-adma.c | 21 +- include/asm-arm/arch-iop13xx/adma.h | 5 - include/asm-arm/hardware/iop3xx-adma.h | 8 - include/asm-arm/hardware/iop_adma.h | 2 - include/linux/dmaengine.h | 11 +- net/core/user_dma.c | 2 +- 17 files changed, 1461 insertions(+), 106 deletions(-) create mode 100644 drivers/dma/fsldma.c create mode 100644 drivers/dma/fsldma.h ## # git git://www.linux-mips.org/pub/scm/upstream-linus.git upstream mips ## Already up-to-date. ## # git git://www.linux-mips.org/pub/scm/upstream.git master mips-devel ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-linus mmc ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-andrew mmc-devel ## Already up-to-date. ## # git git://git.infradead.org/mtd-2.6.git master mtd ## Merge made by recursive. drivers/mtd/onenand/onenand_base.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) ## # git /pub/scm/linux/kernel/git/davem/net-2.6.git master net ## Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 11 +- drivers/connector/connector.c | 2 +- drivers/net/Kconfig | 5 + drivers/net/cs89x0.c | 12 +- drivers/net/e1000e/82571.c | 22 +-- drivers/net/e1000e/defines.h | 10 +- drivers/net/e1000e/e1000.h | 3 +- drivers/net/e1000e/hw.h | 4 +- drivers/net/e1000e/ich8lan.c | 24 ++-- drivers/net/e1000e/lib.c | 50 ++----- drivers/net/e1000e/netdev.c | 18 ++-- drivers/net/e1000e/phy.c | 10 +- drivers/net/ehea/ehea.h | 34 +++++- drivers/net/ehea/ehea_main.c | 281 +++++++++++++++++++++++++++++++++--- drivers/net/fs_enet/fs_enet-main.c | 7 +- drivers/net/gianfar.c | 14 +- drivers/net/igb/igb_main.c | 15 +-- drivers/net/ixgb/ixgb_ethtool.c | 1 + drivers/net/macb.c | 2 +- drivers/net/pcmcia/pcnet_cs.c | 10 +- drivers/net/phy/mdio_bus.c | 4 +- drivers/net/sis190.c | 15 ++- drivers/net/sky2.c | 123 ++++++++-------- drivers/net/sky2.h | 27 ++-- drivers/net/tlan.c | 64 ++++---- drivers/net/tulip/uli526x.c | 12 ++- drivers/net/via-rhine.c | 2 +- drivers/net/virtio_net.c | 2 +- drivers/s390/net/claw.c | 39 +++--- include/linux/connector.h | 2 - net/bluetooth/l2cap.c | 2 + net/ipv4/devinet.c | 1 + net/ipv6/addrconf.c | 3 + net/ipv6/route.c | 2 + net/key/af_key.c | 5 +- net/tipc/cluster.c | 2 +- net/tipc/link.c | 2 +- net/tipc/ref.c | 2 +- net/tipc/zone.c | 2 +- 39 files changed, 551 insertions(+), 295 deletions(-) ## # git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git linux-next nfs ## Merge made by recursive. fs/nfs/client.c | 1 + fs/nfs/direct.c | 9 +- fs/nfs/inode.c | 43 +++++++- fs/nfs/internal.h | 1 + fs/nfs/nfs4proc.c | 10 ++- fs/nfs/nfs4state.c | 8 +- fs/nfs/read.c | 16 +-- fs/nfs/write.c | 65 +++++----- include/linux/sunrpc/clnt.h | 9 +- include/linux/sunrpc/sched.h | 41 +++---- net/sunrpc/auth_gss/auth_gss.c | 5 +- net/sunrpc/clnt.c | 8 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 256 ++++++++++++++++++---------------------- net/sunrpc/xprt.c | 45 ++++--- net/sunrpc/xprtsock.c | 7 +- 16 files changed, 279 insertions(+), 247 deletions(-) ## # git git://git.linux-nfs.org/~bfields/linux.git for-linus nfsd-for-linus ## Already up-to-date. ## # git git://git.linux-nfs.org/~bfields/linux.git for-2.6.26 nfsd ## Auto-merged fs/nfsd/export.c Auto-merged fs/nfsd/nfsctl.c Auto-merged include/net/ipv6.h Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/svcauth_unix.c Merge made by recursive. fs/nfs/symlink.c | 1 - fs/nfsd/export.c | 9 ++- fs/nfsd/nfsctl.c | 15 +++++- include/linux/nfs3.h | 2 +- include/linux/sunrpc/svcauth.h | 4 +- include/net/ipv6.h | 9 +++ net/sunrpc/auth_gss/auth_gss.c | 39 ++++++++----- net/sunrpc/svcauth_unix.c | 118 +++++++++++++++++++++++++++------------- 8 files changed, 135 insertions(+), 62 deletions(-) ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus s390-linus ## Merge made by recursive. arch/s390/kernel/Makefile | 5 +++++ arch/s390/kernel/process.c | 4 ++++ arch/s390/kernel/smp.c | 10 ++-------- arch/s390/kernel/time.c | 2 -- drivers/s390/block/dasd_3990_erp.c | 6 ++---- 5 files changed, 13 insertions(+), 14 deletions(-) ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git features s390 ## Merge made by recursive. drivers/s390/block/dasd_3990_erp.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/s390/block/dasd_int.h | 5 +++++ 2 files changed, 41 insertions(+), 0 deletions(-) ## # git git://git.o-hand.com/linux-rpurdie-backlight for-linus backlight ## Already up-to-date. ## # git git://git.infradead.org/battery-2.6 master battery ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mfasheh/ocfs2.git ALL ocfs2 ## Auto-merged Documentation/feature-removal-schedule.txt Merge made by recursive. Documentation/ABI/obsolete/o2cb | 11 + Documentation/ABI/stable/o2cb | 10 + Documentation/feature-removal-schedule.txt | 10 + fs/ocfs2/alloc.c | 460 +++++++++++++++++++++++++--- fs/ocfs2/cluster/sys.c | 9 + fs/ocfs2/cluster/tcp.c | 51 +++- fs/ocfs2/cluster/tcp_internal.h | 2 + fs/ocfs2/dir.c | 5 +- fs/ocfs2/dlm/dlmcommon.h | 20 +- fs/ocfs2/dlm/dlmdomain.c | 195 +++++++----- fs/ocfs2/dlm/dlmmaster.c | 6 +- fs/ocfs2/dlmglue.c | 8 +- fs/ocfs2/dlmglue.h | 2 - fs/ocfs2/file.c | 4 +- fs/ocfs2/heartbeat.c | 26 +- fs/ocfs2/heartbeat.h | 5 - fs/ocfs2/ioctl.c | 12 +- fs/ocfs2/ioctl.h | 3 +- fs/ocfs2/localalloc.c | 6 +- fs/sysfs/symlink.c | 9 +- 20 files changed, 649 insertions(+), 205 deletions(-) create mode 100644 Documentation/ABI/obsolete/o2cb create mode 100644 Documentation/ABI/stable/o2cb ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-linus selinux-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git next selinux ## Merge made by recursive. security/selinux/hooks.c | 11 +---- security/selinux/include/netlabel.h | 16 ------- security/selinux/include/objsec.h | 8 --- security/selinux/netlabel.c | 81 ++++++----------------------------- security/selinux/ss/avtab.c | 40 +++++++++--------- security/selinux/ss/conditional.c | 16 +++--- security/selinux/ss/ebitmap.c | 14 +++--- security/selinux/ss/policydb.c | 54 ++++++++++++------------ security/selinux/ss/services.c | 28 ++++++------ 9 files changed, 91 insertions(+), 177 deletions(-) ## # git /pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git master sched ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/lethal/sh-2.6.git master sh ## Merge made by recursive. arch/sh/Kconfig | 1 + arch/sh/drivers/dma/dma-sh.c | 2 +- arch/sh/drivers/heartbeat.c | 2 +- arch/sh/drivers/pci/ops-dreamcast.c | 44 +++++++++--------- arch/sh/kernel/cpu/sh2/setup-sh7619.c | 2 +- arch/sh/kernel/cpu/sh2a/clock-sh7203.c | 4 +- arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 2 +- arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 2 +- arch/sh/kernel/cpu/sh3/probe.c | 4 +- arch/sh/kernel/cpu/sh3/setup-sh7705.c | 2 +- arch/sh/kernel/cpu/sh3/setup-sh770x.c | 8 ++-- arch/sh/kernel/cpu/sh3/setup-sh7710.c | 2 +- arch/sh/kernel/cpu/sh3/setup-sh7720.c | 2 +- arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 2 +- arch/sh/kernel/cpu/sh4/setup-sh7750.c | 2 +- arch/sh/kernel/cpu/sh4/setup-sh7760.c | 2 +- arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 2 +- arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 2 +- arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +- arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 2 +- arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 2 +- arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 2 +- arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 2 +- arch/sh/kernel/cpu/sh4a/setup-shx3.c | 2 +- drivers/serial/sh-sci.c | 2 +- drivers/sh/maple/maple.c | 66 +++++++++++++++++--------- include/asm-sh/cpu-sh3/cache.h | 2 +- include/asm-sh/entry-macros.S | 4 +- include/linux/maple.h | 1 - include/{asm-sh/sci.h => linux/serial_sci.h} | 10 ++-- 30 files changed, 101 insertions(+), 83 deletions(-) rename include/{asm-sh/sci.h => linux/serial_sci.h} (73%) ## # git /pub/scm/linux/kernel/git/ericvh/v9fs for-linus v9fs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ericvh/v9fs v9fs-devel v9fs-devel ## Merge made by recursive. Documentation/DocBook/Makefile | 11 ++- fs/9p/fid.h | 15 +++ fs/9p/v9fs.c | 12 +- fs/9p/v9fs.h | 85 ++++++++++---- fs/9p/vfs_addr.c | 2 +- fs/9p/vfs_dir.c | 2 +- fs/9p/vfs_file.c | 11 +- fs/9p/vfs_inode.c | 50 ++++++-- fs/9p/vfs_super.c | 1 + include/linux/parser.h | 2 +- include/net/9p/9p.h | 239 +++++++++++++++++++++++++++++++++++----- include/net/9p/client.h | 35 ++++++ include/net/9p/transport.h | 43 +++++++ lib/parser.c | 32 ++++-- net/9p/conv.c | 128 +++++++++++++++++++++- net/9p/error.c | 11 ++- net/9p/fcprint.c | 8 ++ net/9p/mod.c | 7 +- net/9p/trans_fd.c | 146 +++++++++++++++++++++---- net/9p/trans_virtio.c | 155 ++++++++++++++++++++++++-- net/9p/util.c | 32 +++++- 21 files changed, 887 insertions(+), 140 deletions(-) ## # git /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git master watchdog ## Already up-to-date. ## # git git://oss.sgi.com:8090/xfs/xfs-2.6.git master xfs ## Merge made by recursive. fs/xfs/linux-2.6/xfs_aops.c | 4 +- fs/xfs/linux-2.6/xfs_export.c | 11 +- fs/xfs/linux-2.6/xfs_file.c | 13 +- fs/xfs/linux-2.6/xfs_fs_subr.c | 36 +-- fs/xfs/linux-2.6/xfs_ioctl.c | 562 +++++++++++++++------------------- fs/xfs/linux-2.6/xfs_iops.c | 180 ++++++------ fs/xfs/linux-2.6/xfs_linux.h | 1 - fs/xfs/linux-2.6/xfs_lrw.c | 53 ++-- fs/xfs/linux-2.6/xfs_super.c | 3 +- fs/xfs/linux-2.6/xfs_vnode.h | 19 +- fs/xfs/quota/xfs_qm.c | 6 +- fs/xfs/quota/xfs_qm_bhv.c | 2 +- fs/xfs/quota/xfs_qm_syscalls.c | 4 +- fs/xfs/support/ktrace.c | 37 ++-- fs/xfs/support/ktrace.h | 3 +- fs/xfs/xfs_attr_leaf.c | 6 +- fs/xfs/xfs_bmap.c | 26 +- fs/xfs/xfs_bmap_btree.h | 2 +- fs/xfs/xfs_dir2.c | 2 +- fs/xfs/xfs_fsops.c | 24 +- fs/xfs/xfs_ialloc.c | 6 +- fs/xfs/xfs_iget.c | 49 +--- fs/xfs/xfs_inode.c | 661 ++++++++++++++++++++-------------------- fs/xfs/xfs_inode.h | 23 +-- fs/xfs/xfs_inode_item.c | 4 +- fs/xfs/xfs_inode_item.h | 8 + fs/xfs/xfs_itable.c | 5 +- fs/xfs/xfs_log.c | 61 ++-- fs/xfs/xfs_log_priv.h | 6 +- fs/xfs/xfs_log_recover.c | 19 +- fs/xfs/xfs_mount.c | 44 ++- fs/xfs/xfs_mount.h | 24 +- fs/xfs/xfs_rename.c | 45 +-- fs/xfs/xfs_sb.h | 106 +++---- fs/xfs/xfs_trans_ail.c | 17 +- fs/xfs/xfs_trans_buf.c | 3 +- fs/xfs/xfs_utils.c | 28 +-- fs/xfs/xfs_utils.h | 1 - fs/xfs/xfs_vfsops.c | 38 +-- fs/xfs/xfs_vnodeops.c | 328 ++++++--------------- fs/xfs/xfs_vnodeops.h | 14 +- 41 files changed, 1052 insertions(+), 1432 deletions(-) ## # git /pub/scm/linux/kernel/git/czankel/xtensa-2.6.git testing xtensa ## Removed arch/xtensa/boot/ramdisk/Makefile Merge made by recursive. arch/xtensa/Kconfig | 65 ++++++++++++++++++++++++----------- arch/xtensa/Makefile | 68 +++++++++++++----------------------- arch/xtensa/boot/ramdisk/Makefile | 23 ------------ 3 files changed, 69 insertions(+), 87 deletions(-) delete mode 100644 arch/xtensa/boot/ramdisk/Makefile ## # git /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git release ia64-release ## Already up-to-date. ## # quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ doc ## Using base 2.6.25-rc3 docbook-audit-prms.patch docsrc-spi-split-fix.patch kerndoc-env-set-verbose.patch ## # merge doc ## Merge made by recursive. Documentation/spi/spidev | 168 +--------------------------------------- Documentation/spi/spidev_fdx.c | 158 +++++++++++++++++++++++++++++++++++++ kernel/audit.c | 4 +- scripts/kernel-doc | 4 + 4 files changed, 166 insertions(+), 168 deletions(-) create mode 100644 Documentation/spi/spidev_fdx.c ## # git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git testing lm-sensors ## Merge made by recursive. Documentation/hwmon/w83l785ts | 3 ++- drivers/hwmon/dme1737.c | 5 +++++ drivers/hwmon/f71805f.c | 5 +++++ drivers/hwmon/f71882fg.c | 5 +++++ drivers/hwmon/it87.c | 5 +++++ drivers/hwmon/lm75.c | 5 +---- drivers/hwmon/pc87360.c | 6 ++++++ drivers/hwmon/pc87427.c | 5 +++++ drivers/hwmon/sis5595.c | 5 +++++ drivers/hwmon/smsc47b397.c | 5 +++++ drivers/hwmon/smsc47m1.c | 5 +++++ drivers/hwmon/via686a.c | 5 +++++ drivers/hwmon/vt1211.c | 5 +++++ drivers/hwmon/vt8231.c | 5 +++++ drivers/hwmon/w83627ehf.c | 6 ++++++ drivers/hwmon/w83627hf.c | 5 +++++ drivers/hwmon/w83793.c | 26 ++++++++++++++------------ drivers/hwmon/w83l785ts.c | 4 ++-- 18 files changed, 91 insertions(+), 19 deletions(-) ## # git git://git.infradead.org/~dedekind/ubi-2.6.git master ubi ## Merge made by recursive. Documentation/ABI/stable/sysfs-class-ubi | 212 ++++++++++++++++++++ drivers/mtd/ubi/build.c | 18 +- drivers/mtd/ubi/debug.h | 2 + drivers/mtd/ubi/io.c | 4 + .../ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 +- drivers/mtd/ubi/ubi.h | 13 +- drivers/mtd/ubi/vmt.c | 4 +- include/mtd/Kbuild | 1 - 8 files changed, 239 insertions(+), 23 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-class-ubi rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) ## # git /pub/scm/linux/kernel/git/teigland/dlm.git next dlm ## Merge made by recursive. fs/dlm/config.c | 2 +- fs/dlm/lock.c | 5 ++--- fs/dlm/lock.h | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) ## # git /pub/scm/linux/kernel/git/kyle/parisc-2.6.git master parisc ## Merge made by recursive. arch/parisc/kernel/firmware.c | 27 +++++++++++++++++---------- arch/parisc/kernel/pdc_cons.c | 30 ++++++++++++++++-------------- arch/parisc/kernel/syscall_table.S | 5 ++++- arch/parisc/kernel/traps.c | 2 ++ drivers/parisc/pdc_stable.c | 6 +++--- include/asm-parisc/fixmap.h | 9 ++++++++- include/asm-parisc/pdc.h | 3 +-- include/asm-parisc/pgalloc.h | 4 ++-- include/asm-parisc/pgtable.h | 8 -------- include/asm-parisc/unistd.h | 5 ++++- 10 files changed, 57 insertions(+), 42 deletions(-) ## # git /pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git for-linus blackfinquilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/ m68k ## Already up-to-date. ## # merge m68k ## MERGE m68k not in tree, SKIPPING ## # check ## Differences exist, continuing ## # label ## Created commit edc1f0c: 2.6.25-rc3-mc4 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/merge-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/merge-tree/log- ##