Switched to branch "2.6.25-rc2-mc12" Switched to branch "ide" Switched to branch "2.6.25-rc2-mc12" Already on branch "2.6.25-rc2-mc12" 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-rc2-mc12" Already on branch "2.6.25-rc2-mc12" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc2-mc12" Already on branch "2.6.25-rc2-mc12" Switched to branch "gregkh-usb" Switched to branch "2.6.25-rc2-mc12" Already on branch "2.6.25-rc2-mc12" remote: Counting objects: 643, done. remote: Compressing objects: 0% (1/215)  remote: Compressing objects: 1% (3/215)  remote: Compressing objects: 2% (5/215)  remote: Compressing objects: 3% (7/215)  remote: Compressing objects: 4% (9/215)  remote: Compressing objects: 5% (11/215)  remote: Compressing objects: 6% (13/215)  remote: Compressing objects: 7% (16/215)  remote: Compressing objects: 8% (18/215)  remote: Compressing objects: 9% (20/215)  remote: Compressing objects: 10% (22/215)  remote: Compressing objects: 11% (24/215)  remote: Compressing objects: 12% (26/215)  remote: Compressing objects: 13% (28/215)  remote: Compressing objects: 14% (31/215)  remote: Compressing objects: 15% (33/215)  remote: Compressing objects: 16% (35/215)  remote: Compressing objects: 17% (37/215)  remote: Compressing objects: 18% (39/215)  remote: Compressing objects: 19% (41/215)  remote: Compressing objects: 20% (43/215)  remote: Compressing objects: 21% (46/215)  remote: Compressing objects: 22% (48/215)  remote: Compressing objects: 23% (50/215)  remote: Compressing objects: 24% (52/215)  remote: Compressing objects: 25% (54/215)  remote: Compressing objects: 26% (56/215)  remote: Compressing objects: 27% (59/215)  remote: Compressing objects: 28% (61/215)  remote: Compressing objects: 29% (63/215)  remote: Compressing objects: 30% (65/215)  remote: Compressing objects: 31% (67/215)  remote: Compressing objects: 32% (69/215)  remote: Compressing objects: 33% (71/215)  remote: Compressing objects: 34% (74/215)  remote: Compressing objects: 35% (76/215)  remote: Compressing objects: 36% (78/215)  remote: Compressing objects: 37% (80/215)  remote: Compressing objects: 38% (82/215)  remote: Compressing objects: 39% (84/215)  remote: Compressing objects: 40% (86/215)  remote: Compressing objects: 41% (89/215)  remote: Compressing objects: 42% (91/215)  remote: Compressing objects: 43% (93/215)  remote: Compressing objects: 44% (95/215)  remote: Compressing objects: 45% (97/215)  remote: Compressing objects: 46% (99/215)  remote: Compressing objects: 47% (102/215)  remote: Compressing objects: 48% (104/215)  remote: Compressing objects: 49% (106/215)  remote: Compressing objects: 50% (108/215)  remote: Compressing objects: 51% (110/215)  remote: Compressing objects: 52% (112/215)  remote: Compressing objects: 53% (114/215)  remote: Compressing objects: 54% (117/215)  remote: Compressing objects: 55% (119/215)  remote: Compressing objects: 56% (121/215)  remote: Compressing objects: 57% (123/215)  remote: Compressing objects: 58% (125/215)  remote: Compressing objects: 59% (127/215)  remote: Compressing objects: 60% (129/215)  remote: Compressing objects: 61% (132/215)  remote: Compressing objects: 62% (134/215)  remote: Compressing objects: 63% (136/215)  remote: Compressing objects: 64% (138/215)  remote: Compressing objects: 65% (140/215)  remote: Compressing objects: 66% (142/215)  remote: Compressing objects: 67% (145/215)  remote: Compressing objects: 68% (147/215)  remote: Compressing objects: 69% (149/215)  remote: Compressing objects: 70% (151/215)  remote: Compressing objects: 71% (153/215)  remote: Compressing objects: 72% (155/215)  remote: Compressing objects: 73% (157/215)  remote: Compressing objects: 74% (160/215)  remote: Compressing objects: 75% (162/215)  remote: Compressing objects: 76% (164/215)  remote: Compressing objects: 77% (166/215)  remote: Compressing objects: 78% (168/215)  remote: Compressing objects: 79% (170/215)  remote: Compressing objects: 80% (172/215)  remote: Compressing objects: 81% (175/215)  remote: Compressing objects: 82% (177/215)  remote: Compressing objects: 83% (179/215)  remote: Compressing objects: 84% (181/215)  remote: Compressing objects: 85% (183/215)  remote: Compressing objects: 86% (185/215)  remote: Compressing objects: 87% (188/215)  remote: Compressing objects: 88% (190/215)  remote: Compressing objects: 89% (192/215)  remote: Compressing objects: 90% (194/215)  remote: Compressing objects: 91% (196/215)  remote: Compressing objects: 92% (198/215)  remote: Compressing objects: 93% (200/215)  remote: Compressing objects: 94% (203/215)  remote: Compressing objects: 95% (205/215)  remote: Compressing objects: 96% (207/215)  remote: Compressing objects: 97% (209/215)  remote: Compressing objects: 98% (211/215)  remote: Compressing objects: 99% (213/215)  remote: Compressing objects: 100% (215/215)  remote: Compressing objects: 100% (215/215), done. Receiving objects: 0% (1/469) Receiving objects: 1% (5/469) Receiving objects: 2% (10/469) Receiving objects: 3% (15/469) Receiving objects: 4% (19/469) Receiving objects: 5% (24/469) Receiving objects: 6% (29/469) Receiving objects: 7% (33/469) Receiving objects: 8% (38/469) Receiving objects: 9% (43/469) Receiving objects: 10% (47/469) Receiving objects: 11% (52/469) Receiving objects: 12% (57/469) Receiving objects: 13% (61/469) Receiving objects: 14% (66/469) Receiving objects: 15% (71/469) Receiving objects: 16% (76/469) Receiving objects: 17% (80/469) Receiving objects: 18% (85/469) Receiving objects: 19% (90/469) Receiving objects: 20% (94/469) Receiving objects: 21% (99/469) Receiving objects: 22% (104/469) Receiving objects: 23% (108/469) Receiving objects: 24% (113/469) Receiving objects: 25% (118/469) Receiving objects: 26% (122/469) Receiving objects: 27% (127/469) Receiving objects: 28% (132/469) Receiving objects: 29% (137/469) Receiving objects: 30% (141/469) Receiving objects: 31% (146/469) Receiving objects: 32% (151/469) Receiving objects: 33% (155/469) remote: Total 469 (delta 410), reused 313 (delta 254) Receiving objects: 34% (160/469) Receiving objects: 35% (165/469) Receiving objects: 36% (169/469) Receiving objects: 37% (174/469) Receiving objects: 38% (179/469) Receiving objects: 39% (183/469) Receiving objects: 40% (188/469) Receiving objects: 41% (193/469) Receiving objects: 42% (197/469) Receiving objects: 43% (202/469) Receiving objects: 44% (207/469) Receiving objects: 45% (212/469) Receiving objects: 46% (216/469) Receiving objects: 47% (221/469) Receiving objects: 48% (226/469) Receiving objects: 49% (230/469) Receiving objects: 50% (235/469) Receiving objects: 51% (240/469) Receiving objects: 52% (244/469) Receiving objects: 53% (249/469) Receiving objects: 54% (254/469) Receiving objects: 55% (258/469) Receiving objects: 56% (263/469) Receiving objects: 57% (268/469) Receiving objects: 58% (273/469) Receiving objects: 59% (277/469) Receiving objects: 60% (282/469) Receiving objects: 61% (287/469) Receiving objects: 62% (291/469) Receiving objects: 63% (296/469) Receiving objects: 64% (301/469) Receiving objects: 65% (305/469) Receiving objects: 66% (310/469) Receiving objects: 67% (315/469) Receiving objects: 68% (319/469) Receiving objects: 69% (324/469) Receiving objects: 70% (329/469) Receiving objects: 71% (333/469) Receiving objects: 72% (338/469) Receiving objects: 73% (343/469) Receiving objects: 74% (348/469) Receiving objects: 75% (352/469) Receiving objects: 76% (357/469) Receiving objects: 77% (362/469) Receiving objects: 78% (366/469) Receiving objects: 79% (371/469) Receiving objects: 80% (376/469) Receiving objects: 81% (380/469) Receiving objects: 82% (385/469) Receiving objects: 83% (390/469) Receiving objects: 84% (394/469) Receiving objects: 85% (399/469) Receiving objects: 86% (404/469) Receiving objects: 87% (409/469) Receiving objects: 88% (413/469) Receiving objects: 89% (418/469) Receiving objects: 90% (423/469) Receiving objects: 91% (427/469) Receiving objects: 92% (432/469) Receiving objects: 93% (437/469) Receiving objects: 94% (441/469) Receiving objects: 95% (446/469) Receiving objects: 96% (451/469) Receiving objects: 97% (455/469) Receiving objects: 98% (460/469) Receiving objects: 99% (465/469) Receiving objects: 100% (469/469) Receiving objects: 100% (469/469), 137.99 KiB, done. Resolving deltas: 0% (1/410) Resolving deltas: 10% (45/410) Resolving deltas: 20% (83/410) Resolving deltas: 23% (95/410) Resolving deltas: 24% (99/410) Resolving deltas: 25% (105/410) Resolving deltas: 26% (107/410) Resolving deltas: 27% (113/410) Resolving deltas: 28% (116/410) Resolving deltas: 33% (137/410) Resolving deltas: 34% (140/410) Resolving deltas: 35% (146/410) Resolving deltas: 36% (148/410) Resolving deltas: 37% (152/410) Resolving deltas: 38% (156/410) Resolving deltas: 40% (168/410) Resolving deltas: 41% (169/410) Resolving deltas: 42% (173/410) Resolving deltas: 44% (183/410) Resolving deltas: 45% (185/410) Resolving deltas: 46% (189/410) Resolving deltas: 47% (193/410) Resolving deltas: 48% (199/410) Resolving deltas: 49% (202/410) Resolving deltas: 50% (205/410) Resolving deltas: 51% (211/410) Resolving deltas: 52% (214/410) Resolving deltas: 59% (245/410) Resolving deltas: 60% (250/410) Resolving deltas: 62% (255/410) Resolving deltas: 63% (262/410) Resolving deltas: 64% (263/410) Resolving deltas: 65% (267/410) Resolving deltas: 66% (271/410) Resolving deltas: 67% (275/410) Resolving deltas: 68% (279/410) Resolving deltas: 69% (283/410) Resolving deltas: 70% (287/410) Resolving deltas: 71% (292/410) Resolving deltas: 72% (297/410) Resolving deltas: 73% (301/410) Resolving deltas: 74% (304/410) Resolving deltas: 75% (308/410) Resolving deltas: 76% (312/410) Resolving deltas: 77% (319/410) Resolving deltas: 78% (320/410) Resolving deltas: 79% (326/410) Resolving deltas: 80% (328/410) Resolving deltas: 81% (333/410) Resolving deltas: 82% (337/410) Resolving deltas: 83% (341/410) Resolving deltas: 84% (345/410) Resolving deltas: 85% (350/410) Resolving deltas: 86% (355/410) Resolving deltas: 88% (362/410) Resolving deltas: 89% (365/410) Resolving deltas: 90% (369/410) Resolving deltas: 91% (374/410) Resolving deltas: 92% (378/410) Resolving deltas: 93% (382/410) Resolving deltas: 94% (386/410) Resolving deltas: 95% (390/410) Resolving deltas: 96% (395/410) Resolving deltas: 97% (398/410) Resolving deltas: 98% (403/410) Resolving deltas: 99% (406/410) Resolving deltas: 100% (410/410) Resolving deltas: 100% (410/410), completed with 156 local objects. From /pub/scm/linux/kernel/git/mchehab/v4l-dvb 9a4c854..2cfe939 devel -> dvb Switched to branch "i2c" Switched to branch "2.6.25-rc2-mc12" Already on branch "2.6.25-rc2-mc12" From /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 1f1519e..39273b5 release -> acpi remote: Generating pack... remote: Done counting 25 objects. remote: Result has 14 objects. remote: Deltifying 14 objects... remote: 7% (1/14) done remote: 14% (2/14) done remote: 21% (3/14) done remote: 28% (4/14) done remote: 35% (5/14) done remote: 42% (6/14) done remote: 50% (7/14) done remote: 57% (8/14) done remote: 64% (9/14) done remote: 71% (10/14) done remote: 78% (11/14) done remote: 85% (12/14) done remote: 92% (13/14) done remote: 100% (14/14) done remote: remote: Total 14 (delta 12), reused 5 (delta 3) From git://git.linux-nfs.org/projects/trondmy/nfs-2.6 + 1a4c6be...cbc2005 linux-next -> nfs (forced update) From git://git.linux-nfs.org/~bfields/linux * [new branch] for-linus -> nfsd-for-linus remote: Generating pack... remote: Done counting 48 objects. remote: Result has 29 objects. remote: Deltifying 29 objects... remote: 0% (0/29) done remote: 3% (1/29) done remote: 6% (2/29) done remote: 10% (3/29) done remote: 13% (4/29) done remote: 17% (5/29) done remote: 20% (6/29) done remote: 24% (7/29) done remote: 27% (8/29) done remote: 31% (9/29) done remote: 34% (10/29) done remote: 37% (11/29) done remote: 41% (12/29) done remote: 44% (13/29) done remote: 48% (14/29) done remote: 51% (15/29) done remote: 55% (16/29) done remote: 58% (17/29) done remote: 62% (18/29) done remote: 65% (19/29) done remote: 68% (20/29) done remote: 72% (21/29) done remote: 75% (22/29) done remote: 79% (23/29) done remote: 82% (24/29) done remote: 86% (25/29) done remote: 89% (26/29) done remote: 93% (27/29) done remote: 96% (28/29) done remote: 100% (29/29) done remote: remote: Total 29 (delta 26), reused 0 (delta 0) From git://git.linux-nfs.org/~bfields/linux * [new branch] for-2.6.26 -> nfsd remote: Counting objects: 44, done. remote: Compressing objects: 5% (1/18)  remote: Compressing objects: 11% (2/18)  remote: Compressing objects: 16% (3/18)  remote: Compressing objects: 22% (4/18)  remote: Compressing objects: 27% (5/18)  remote: Compressing objects: 33% (6/18)  remote: Compressing objects: 38% (7/18)  remote: Compressing objects: 44% (8/18)  remote: Compressing objects: 50% (9/18)  remote: Compressing objects: 55% (10/18)  remote: Compressing objects: 61% (11/18)  remote: Compressing objects: 66% (12/18)  remote: Compressing objects: 72% (13/18)  remote: Compressing objects: 77% (14/18)  remote: Compressing objects: 83% (15/18)  remote: Compressing objects: 88% (16/18)  remote: Compressing objects: 94% (17/18)  remote: Compressing objects: 100% (18/18)  remote: Compressing objects: 100% (18/18), done. remote: Total 34 (delta 29), reused 21 (delta 16) From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 + fc38453...627ce39 master -> x86 (forced update) Switched to branch "doc" Switched to branch "2.6.25-rc2-mc12" Already on branch "2.6.25-rc2-mc12" From /pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * [new branch] for-linus -> blackfin | 2 +- drivers/ide/legacy/q40ide.c | 2 +- drivers/ide/legacy/qd65xx.c | 106 ++++-- drivers/ide/legacy/umc8672.c | 31 ++- drivers/ide/mips/au1xxx-ide.c | 13 +- drivers/ide/mips/swarm.c | 9 +- drivers/ide/pci/aec62xx.c | 3 +- drivers/ide/pci/alim15x3.c | 1 - drivers/ide/pci/amd74xx.c | 4 +- drivers/ide/pci/atiixp.c | 5 +- drivers/ide/pci/cmd640.c | 119 +++--- drivers/ide/pci/cmd64x.c | 9 +- drivers/ide/pci/cs5520.c | 3 +- drivers/ide/pci/cs5530.c | 3 +- drivers/ide/pci/cs5535.c | 2 +- drivers/ide/pci/cy82c693.c | 3 +- drivers/ide/pci/delkin_cb.c | 12 +- drivers/ide/pci/generic.c | 6 +- drivers/ide/pci/hpt34x.c | 2 +- drivers/ide/pci/hpt366.c | 101 ++---- drivers/ide/pci/it8213.c | 3 +- drivers/ide/pci/it821x.c | 1 - drivers/ide/pci/jmicron.c | 1 - drivers/ide/pci/ns87415.c | 7 +- drivers/ide/pci/opti621.c | 6 +- drivers/ide/pci/piix.c | 4 +- drivers/ide/pci/rz1000.c | 2 +- drivers/ide/pci/sc1200.c | 3 +- drivers/ide/pci/scc_pata.c | 17 +- drivers/ide/pci/serverworks.c | 5 +- drivers/ide/pci/sgiioc4.c | 32 +-- drivers/ide/pci/siimage.c | 44 --- drivers/ide/pci/sis5513.c | 3 +- drivers/ide/pci/sl82c105.c | 7 +- drivers/ide/pci/slc90e66.c | 2 +- drivers/ide/pci/tc86c001.c | 36 -- drivers/ide/pci/triflex.c | 1 - drivers/ide/pci/trm290.c | 1 - drivers/ide/pci/via82cxxx.c | 4 +- drivers/ide/ppc/mpc8xx.c | 130 +++---- drivers/ide/ppc/pmac.c | 194 ++++------- drivers/ide/setup-pci.c | 97 +----- drivers/macintosh/mediabay.c | 17 +- drivers/scsi/ide-scsi.c | 203 +++++------ include/asm-alpha/ide.h | 11 - include/asm-arm/ide.h | 8 - include/asm-blackfin/ide.h | 4 - include/asm-ia64/ide.h | 10 - include/asm-m32r/ide.h | 10 - include/asm-mips/mach-generic/ide.h | 10 - include/asm-parisc/ide.h | 2 - include/asm-powerpc/ide.h | 57 ++-- include/asm-powerpc/mediabay.h | 6 +- include/asm-sh/ide.h | 3 - include/asm-sparc/ide.h | 2 - include/asm-sparc64/ide.h | 2 - include/asm-x86/ide.h | 10 - include/linux/Kbuild | 1 - include/linux/hdreg.h | 4 +- include/linux/hdsmart.h | 126 ------- include/linux/ide.h | 196 ++++++---- 131 files changed, 1821 insertions(+), 2802 deletions(-) create mode 100644 Documentation/ide/warm-plug-howto.txt create mode 100644 drivers/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 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 312102 bytes received 466 bytes 125027.20 bytes/sec total size is 309628 speedup is 0.99 2.6.25-rc2-git6 to 1a4c6be4aca5ad6b300932efed1e2729fdc25af9 Using base 1a4c6be4aca5ad6b300932efed1e2729fdc25af9 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 | 52 + 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, 9567 insertions(+), 118 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 63883 bytes received 466 bytes 18385.43 bytes/sec total size is 61527 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 3411161 bytes received 818 bytes 974851.14 bytes/sec total size is 3406516 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/pci/hda/hda_codec.c | 59 ++++++++++- sound/pci/hda/hda_codec.h | 12 ++- sound/pci/hda/hda_intel.c | 89 ++++++++------- sound/pci/hda/patch_analog.c | 1 + sound/pci/hda/patch_atihdmi.c | 6 + sound/pci/hda/patch_cmedia.c | 1 + sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 130 ++++++++++++++-------- sound/pci/hda/patch_si3054.c | 2 +- sound/pci/hda/patch_sigmatel.c | 1 + sound/pci/hda/patch_via.c | 1 + sound/pci/ice1712/hoontech.c | 21 +++- sound/pci/ice1712/revo.c | 51 +++++----- sound/pci/intel8x0.c | 6 + sound/usb/caiaq/caiaq-control.c | 4 +- 17 files changed, 264 insertions(+), 124 deletions(-) ## # 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 | 117 ++++++++++--------------- 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, 306 insertions(+), 437 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 ## Already up-to-date. ## # 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.saa7134 | 3 + 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/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 | 2 +- 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 | 45 + 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-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-i2c.c | 2 +- drivers/media/video/cx88/cx88-blackbird.c | 2 +- drivers/media/video/cx88/cx88-core.c | 6 +- drivers/media/video/cx88/cx88-dvb.c | 2 +- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 2 +- drivers/media/video/cx88/cx88-mpeg.c | 2 +- drivers/media/video/cx88/cx88-tvaudio.c | 6 +- drivers/media/video/cx88/cx88-vbi.c | 2 +- drivers/media/video/cx88/cx88-video.c | 4 +- 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 | 6 +- drivers/media/video/ivtv/ivtv-yuv.c | 6 +- drivers/media/video/meye.c | 12 +- drivers/media/video/mt20xx.c | 7 +- drivers/media/video/mt9m001.c | 692 +++++++++++++++ drivers/media/video/mt9v022.c | 802 +++++++++++++++++ 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 | 937 ++++++++++++++++++++ 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 | 2 +- drivers/media/video/saa7134/saa7134-cards.c | 134 +++- drivers/media/video/saa7134/saa7134-core.c | 10 +- drivers/media/video/saa7134/saa7134-dvb.c | 86 ++- drivers/media/video/saa7134/saa7134-empress.c | 2 +- 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 | 2 +- drivers/media/video/saa7134/saa7134.h | 9 +- 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/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 | 506 +++++++----- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 6 + drivers/media/video/tuner-xc2028.c | 10 +- drivers/media/video/tvaudio.c | 8 +- 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 | 2 +- drivers/media/video/videobuf-dma-sg.c | 2 +- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 2 +- 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 | 166 +++- include/linux/meye.h | 2 +- include/linux/videodev2.h | 52 +- include/media/soc_camera.h | 147 ++++ include/media/v4l2-chip-ident.h | 6 + 146 files changed, 5170 insertions(+), 708 deletions(-) create mode 100644 drivers/media/dvb/frontends/isl6405.c create mode 100644 drivers/media/dvb/frontends/isl6405.h create mode 100644 drivers/media/video/mt9m001.c create mode 100644 drivers/media/video/mt9v022.c create mode 100644 drivers/media/video/pxa_camera.c create mode 100644 drivers/media/video/soc_camera.c create mode 100644 include/asm-arm/arch-pxa/camera.h create mode 100644 include/media/soc_camera.h ## # quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## 2.6.25-rc2-git6 to 1a4c6be4aca5ad6b300932efed1e2729fdc25af9 Using base 1a4c6be4aca5ad6b300932efed1e2729fdc25af9 i2c-pxa-misc-fixes.patch i2c-storage-class-should-be-before-const-qualifier.patch alchemy-compile-fix.patch i2c-pca-isa-add-access-check-to-legacy-ioports.patch make-i2c_register_board_info-a-nop-when-CONFIG_I2C_BOARDINFO=n.patch i2c-i801-add-ich10-support.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.patch i2c-ibm_iic-01-change-log-levels.patch i2c-ibm_iic-02-of-platform.patch ## # merge i2c ## Removed drivers/i2c/algos/i2c-algo-pca.h Merge made by recursive. Documentation/i2c/busses/i2c-i801 | 3 +- 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 | 4 +- drivers/i2c/busses/i2c-i801.c | 10 ++- drivers/i2c/busses/i2c-ibm_iic.c | 197 ++++++++++++++++++++++++++++++++- drivers/i2c/busses/i2c-pca-isa.c | 60 +++++------ drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pxa.c | 25 +++-- include/asm-mips/mach-db1x00/db1200.h | 1 + include/asm-mips/mach-db1x00/db1x00.h | 1 + include/asm-mips/mach-pb1x00/pb1200.h | 1 + include/asm-mips/mach-pb1x00/pb1550.h | 1 + include/linux/i2c-algo-pca.h | 37 ++++++- include/linux/i2c.h | 11 ++- 16 files changed, 359 insertions(+), 186 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 ## Already up-to-date. ## # 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/Kconfig Removed arch/x86/kvm/segment_descriptor.h Merge made by recursive. arch/x86/Kconfig | 10 ++ arch/x86/kernel/Makefile | 1 + arch/x86/kernel/kvmclock.c | 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/mmu.c | 204 +++++++++++++++++++------ arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 37 +++-- arch/x86/kvm/segment_descriptor.h | 29 ---- arch/x86/kvm/svm.c | 235 ++++++++++++++++++++++------ arch/x86/kvm/vmx.c | 125 ++++++++++++---- arch/x86/kvm/vmx.h | 10 +- arch/x86/kvm/x86.c | 309 +++++++++++++++++++++++++++---------- arch/x86/kvm/x86_emulate.c | 256 +++++++++++++++++-------------- include/asm-x86/kvm_host.h | 18 ++- include/asm-x86/kvm_para.h | 25 +++ include/linux/kvm.h | 7 +- include/linux/kvm_host.h | 9 +- virt/kvm/kvm_main.c | 41 +++++- 20 files changed, 1122 insertions(+), 373 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 ## Already up-to-date. ## # 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/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 ++- 10 files changed, 20 insertions(+), 19 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 ## Already up-to-date. ## # 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 ## Merge made by recursive. Documentation/debugging-via-ohci1394.txt | 17 +- drivers/firewire/fw-cdev.c | 17 +- drivers/firewire/fw-device.c | 48 +++-- drivers/firewire/fw-device.h | 2 +- drivers/firewire/fw-sbp2.c | 358 +++++++++++++++++++++++------- drivers/ieee1394/sbp2.c | 15 ++ drivers/ieee1394/sbp2.h | 2 + 7 files changed, 350 insertions(+), 109 deletions(-) ## # 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 net/core/dev.c Merge made by recursive. drivers/net/niu.c | 9 +- drivers/net/niu.h | 2 +- drivers/net/veth.c | 53 +++++++++--- drivers/net/wireless/ath5k/ath5k.h | 2 +- drivers/net/wireless/ath5k/base.c | 20 +++-- drivers/net/wireless/ath5k/hw.c | 8 +- drivers/net/wireless/p54usb.c | 2 + drivers/net/wireless/rtl8180_dev.c | 4 +- drivers/net/wireless/rtl8187_dev.c | 4 +- drivers/net/wireless/zd1211rw/zd_mac.c | 12 ++- drivers/ssb/Kconfig | 6 ++ drivers/ssb/Makefile | 1 + drivers/ssb/driver_chipcommon.c | 65 ++++++++++++--- drivers/ssb/driver_extif.c | 25 +++++- drivers/ssb/driver_pcicore.c | 45 ++++++++-- drivers/ssb/embedded.c | 132 +++++++++++++++++++++++++++++ drivers/ssb/main.c | 4 + include/linux/netfilter.h | 2 +- include/linux/netfilter/Kbuild | 2 +- include/linux/netfilter/xt_hashlimit.h | 1 - include/linux/ssb/ssb.h | 12 +++ include/linux/ssb/ssb_driver_chipcommon.h | 18 +++- include/linux/ssb/ssb_driver_extif.h | 18 +++- include/linux/ssb/ssb_driver_pci.h | 5 + include/linux/ssb/ssb_embedded.h | 18 ++++ net/9p/trans_virtio.c | 2 +- net/bridge/netfilter/ebt_dnat.c | 2 +- net/bridge/netfilter/ebt_redirect.c | 2 +- net/bridge/netfilter/ebt_snat.c | 2 +- net/core/dev.c | 2 +- net/core/neighbour.c | 1 + net/core/rtnetlink.c | 2 + net/ipv4/fib_hash.c | 10 +- net/ipv4/netfilter/arpt_mangle.c | 2 +- net/ipv4/netfilter/ip_queue.c | 12 ++- net/ipv6/netfilter/ip6_queue.c | 10 ++- net/netfilter/nfnetlink_queue.c | 10 ++- net/netfilter/xt_hashlimit.c | 3 - net/netfilter/xt_iprange.c | 2 +- net/netfilter/xt_u32.c | 11 +-- net/sctp/socket.c | 2 + 41 files changed, 443 insertions(+), 102 deletions(-) create mode 100644 drivers/ssb/embedded.c create mode 100644 include/linux/ssb/ssb_embedded.h ## # git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git linux-next nfs ## Merge made by recursive. fs/nfs/write.c | 34 +++++++++++++++++++--------------- include/linux/sunrpc/clnt.h | 9 +++++---- net/sunrpc/clnt.c | 4 ++-- 3 files changed, 26 insertions(+), 21 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 ## Already up-to-date. ## # 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/kernel/cpu/sh3/probe.c | 4 ++-- include/asm-sh/cpu-sh3/cache.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ## # 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 ## Already up-to-date. ## # 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 | 2 +- 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 | 67 ++--- fs/xfs/linux-2.6/xfs_linux.h | 1 - fs/xfs/linux-2.6/xfs_lrw.c | 31 +-- 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/xfs_attr_leaf.c | 6 +- fs/xfs/xfs_bmap.c | 22 +- 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 | 10 +- fs/xfs/xfs_mount.h | 2 +- fs/xfs/xfs_rename.c | 17 +- fs/xfs/xfs_sb.h | 69 +---- 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 | 34 +-- fs/xfs/xfs_vnodeops.c | 218 +++----------- fs/xfs/xfs_vnodeops.h | 2 - 38 files changed, 821 insertions(+), 1215 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 ## Auto-merged arch/x86/kernel/Makefile Merge made by recursive. arch/x86/kernel/Makefile | 1 + arch/x86/kernel/entry_64.S | 6 ++++-- arch/x86/kernel/process_64.c | 20 ++++++++++++++++---- include/asm-x86/system.h | 14 ++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-) ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git release ia64-release ## Already up-to-date. ## # quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ doc ## 2.6.25-rc2-git6 to 1a4c6be4aca5ad6b300932efed1e2729fdc25af9 Using base 1a4c6be4aca5ad6b300932efed1e2729fdc25af9 docbook-audit-prms.patch docbook-libata-ap.patch docsrc-spi-split-fix.patch ## # merge doc ## Merge made by recursive. Documentation/spi/spidev | 168 +--------------------------------------- Documentation/spi/spidev_fdx.c | 158 +++++++++++++++++++++++++++++++++++++ drivers/ata/libata-core.c | 2 +- kernel/audit.c | 4 +- 4 files changed, 163 insertions(+), 169 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. drivers/hwmon/dme1737.c | 5 +++++ drivers/hwmon/f71805f.c | 5 +++++ drivers/hwmon/f71882fg.c | 5 +++++ drivers/hwmon/it87.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 +++++ 14 files changed, 72 insertions(+), 0 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 blackfin ## Already up-to-date. ## # check ## Differences exist, continuing ## # label ## Created commit 397ba28: 2.6.25-rc2-mc12 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- ##