From /pub/scm/linux/kernel/git/torvalds/linux-2.6 84c6f60..bf5a25e master -> linus Switched to branch "2.6.25-rc4-mc8" 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-rc4-mc8" Already on branch "2.6.25-rc4-mc8" Switched to branch "gregkh-pci" .dotest/patch:167: space before tab in indent. dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name); warning: 1 line adds whitespace errors. Switched to branch "2.6.25-rc4-mc8" Already on branch "2.6.25-rc4-mc8" Switched to branch "gregkh-usb" .dotest/patch:225: space before tab in indent. */ warning: 1 line adds whitespace errors. .dotest/patch:2601: space before tab in indent. dbg(1," %s : file is NULL", __func__); .dotest/patch:2609: space before tab in indent. dbg(1," %s : object is NULL", __func__); .dotest/patch:8445: space before tab in indent. dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length); .dotest/patch:8820: space before tab in indent. dbg ("%s - Update complete 0x%x", __func__, status); .dotest/patch:8884: space before tab in indent. dbg ("%s - Error downloading operational code image", __func__); warning: squelched 5 whitespace errors warning: 10 lines add whitespace errors. Switched to branch "2.6.25-rc4-mc8" Already on branch "2.6.25-rc4-mc8" fatal: '/pub/scm/linux/kernel/git/perex/alsa.git': unable to chdir or not a git archive fatal: The remote end hung up unexpectedly error: branch 'alsa' not found. Already on branch "2.6.25-rc4-mc8" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "i2c" Switched to branch "2.6.25-rc4-mc8" Already on branch "2.6.25-rc4-mc8" error: branch 'selinux' not found. remote: Counting objects: 2513, done. remote: Compressing objects: 0% (1/323) remote: Compressing objects: 1% (4/323) remote: Compressing objects: 2remote: % (7/323) remote: Compressing objects: 3% (10/323) remote: Compressing objects: 4% (13/323) remote: Compressing objects: 5% (17/323) remote: Cremote: ompressing objects: 6% (20/323) remote: Compressing objects: 7% (23/323) remote: Compressing objects: 8% (26/323) remote: Compressing objects: 9% (30/323) remote: Compressing objects: 10% (33/323) remote: Compressing objects: 11% (36/323) remote: Compressing o bremote: jects: 12% (39/323) remote: Compressing objects: 13% (42/323) remote: Compressing objects: 14% (46/323) remote: Compressing objects: 15% ( 4remote: 9/323) remote: Compressing objects: 16% (52/323) remote: Compressing objects: 17% (55/323) remote: Compressing objects: 18% (59/323) remote: Com premote: ressing objects: 19% (62/323) remote: Compressing objects: 20% (65/323) remote: Compressing objects: 21% (68/323) remote: Compressing objec tremote: s: 22% (72/323) remote: Compressing objects: 23% (75/323) remote: Compressing objects: 24% (78/323) remote: Compressing objects: 25% (81/3 2remote: 3) remote: Compressing objects: 26% (84/323) remote: Compressing objects: 27% (88/323) remote: Compressing objects: 28% (91/323) remote: Compres sremote: ing objects: 29% (94/323) remote: Compressing objects: 30% (97/323) remote: Compressing objects: 31% (101/323) remote: Compressing objects: remote: 32% (104/323) remote: Compressing objects: 33% (107/323) remote: Compressing objects: 34% (110/323) remote: Compressing objects: 35% (114/ 3remote: 23) remote: Compressing objects: 36% (117/323) remote: Compressing objects: 37% (120/323) remote: Compressing objects: 38% (123/323) remote: Com premote: ressing objects: 39% (126/323) remote: Compressing objects: 40% (130/323) remote: Compressing objects: 41% (133/323) remote: Compressing ob jremote: ects: 42% (136/323) remote: Compressing objects: 43% (139/323) remote: Compressing objects: 44% (143/323) remote: Compressing objects: 45% remote: (146/323) remote: Compressing objects: 46% (149/323) remote: Compressing objects: 47% (152/323) remote: Compressing objects: 48% (156/323) remote: remote: Compressing objects: 49% (159/323) remote: Compressing objects: 50% (162/323) remote: Compressing objects: 51% (165/323) remote: Compress iremote: ng objects: 52% (168/323) remote: Compressing objects: 53% (172/323) remote: Compressing objects: 54% (175/323) remote: Compressing objects :remote: 55% (178/323) remote: Compressing objects: 56% (181/323) remote: Compressing objects: 57% (185/323) remote: Compressing objects: 58% (188 /remote: 323) remote: Compressing objects: 59% (191/323) remote: Compressing objects: 60% (194/323) remote: Compressing objects: 61% (198/323) remote: Co mremote: pressing objects: 62% (201/323) remote: Compressing objects: 63% (204/323) remote: Compressing objects: 64% (207/323) remote: Compressing o bremote: jects: 65% (210/323) remote: Compressing objects: 66% (214/323) remote: Compressing objects: 67% (217/323) remote: Compressing objects: 68 %remote: (220/323) remote: Compressing objects: 69% (223/323) remote: Compressing objects: 70% (227/323) remote: Compressing objects: 71% (230/323) remote: remote: Compressing objects: 72% (233/323) remote: Compressing objects: 73% (236/323) remote: Compressing objects: 74% (240/323) remote: Compres sremote: ing objects: 75% (243/323) remote: Compressing objects: 76% (246/323) remote: Compressing objects: 77% (249/323) remote: Compressing object sremote: : 78% (252/323) remote: Compressing objects: 79% (256/323) remote: Compressing objects: 80% (259/323) remote: Compressing objects: 81% (26 2remote: /323) remote: Compressing objects: 82% (265/323) remote: Compressing objects: 83% (269/323) remote: Compressing objects: 84% (272/323) remote: C oremote: mpressing objects: 85% (275/323) remote: Compressing objects: 86% (278/323) remote: Compressing objects: 87% (282/323) remote: Compressing oremote: bjects: 88% (285/323) remote: Compressing objects: 89% (288/323) remote: Compressing objects: 90% (291/323) remote: Compressing objects: 9 1remote: % (294/323) remote: Compressing objects: 92% (298/323) remote: Compressing objects: 93% (301/323) remote: Compressing objects: 94% (304/323 )remote: remote: Compressing objects: 95% (307/323) remote: Compressing objects: 96% (311/323) remote: Compressing objects: 97% (314/323) remote: Compre sremote: sing objects: 98% (317/323) remote: Compressing objects: 99% (320/323) remote: Compressing objects: 100% (323/323) remote: Compressing objec tremote: s: 100% (323/323), done. Receiving objects: 0% (1/2199) Receiving objects: 1% (22/2199) Receiving objects: 2% (44/2199) Receiving objects: 3% (66/2199) Receiving objects: 4% (88/2199) Receiving objects: 5% (110/2199) Receiving objects: 6% (132/2199) Receiving objects: 7% (154/2199) Receiving objects: 8% (176/2199) Receiving objects: 9% (198/2199) Receiving objects: 10% (220/2199) Receiving objects: 11% (242/2199) Receiving objects: 12% (264/2199) Receiving objects: 13% (286/2199) Receiving objects: 14% (308/2199) Receiving objects: 15% (330/2199) Receiving objects: 16% (352/2199) Receiving objects: 17% (374/2199) Receiving objects: 18% (396/2199) Receiving objects: 19% (418/2199) Receiving objects: 20% (440/2199) Receiving objects: 21% (462/2199) Receiving objects: 22% (484/2199) Receiving objects: 23% (506/2199) Receiving objects: 24% (528/2199) Receiving objects: 25% (550/2199) Receiving objects: 26% (572/2199) Receiving objects: 27% (594/2199) Receiving objects: 28% (616/2199) Receiving objects: 29% (638/2199) Receiving objects: 30% (660/2199) remote: Total 2199 (delta 1874), reused 2199 (delta 1874) Receiving objects: 31% (682/2199) Receiving objects: 32% (704/2199) Receiving objects: 33% (726/2199) Receiving objects: 34% (748/2199) Receiving objects: 35% (770/2199) Receiving objects: 36% (792/2199) Receiving objects: 37% (814/2199) Receiving objects: 38% (836/2199) Receiving objects: 39% (858/2199) Receiving objects: 40% (880/2199) Receiving objects: 41% (902/2199) Receiving objects: 42% (924/2199) Receiving objects: 43% (946/2199) Receiving objects: 44% (968/2199) Receiving objects: 45% (990/2199) Receiving objects: 46% (1012/2199) Receiving objects: 47% (1034/2199) Receiving objects: 48% (1056/2199) Receiving objects: 49% (1078/2199) Receiving objects: 50% (1100/2199) Receiving objects: 51% (1122/2199) Receiving objects: 52% (1144/2199) Receiving objects: 53% (1166/2199) Receiving objects: 54% (1188/2199) Receiving objects: 55% (1210/2199) Receiving objects: 56% (1232/2199) Receiving objects: 57% (1254/2199) Receiving objects: 58% (1276/2199) Receiving objects: 59% (1298/2199) Receiving objects: 60% (1320/2199) Receiving objects: 61% (1342/2199) Receiving objects: 62% (1364/2199) Receiving objects: 63% (1386/2199) Receiving objects: 64% (1408/2199) Receiving objects: 65% (1430/2199) Receiving objects: 66% (1452/2199) Receiving objects: 67% (1474/2199) Receiving objects: 68% (1496/2199) Receiving objects: 69% (1518/2199) Receiving objects: 70% (1540/2199) Receiving objects: 71% (1562/2199) Receiving objects: 72% (1584/2199) Receiving objects: 73% (1606/2199) Receiving objects: 74% (1628/2199) Receiving objects: 75% (1650/2199) Receiving objects: 76% (1672/2199) Receiving objects: 77% (1694/2199) Receiving objects: 78% (1716/2199) Receiving objects: 79% (1738/2199) Receiving objects: 80% (1760/2199) Receiving objects: 81% (1782/2199) Receiving objects: 82% (1804/2199) Receiving objects: 83% (1826/2199) Receiving objects: 84% (1848/2199) Receiving objects: 85% (1870/2199) Receiving objects: 86% (1892/2199) Receiving objects: 87% (1914/2199) Receiving objects: 88% (1936/2199) Receiving objects: 89% (1958/2199) Receiving objects: 90% (1980/2199) Receiving objects: 91% (2002/2199) Receiving objects: 92% (2024/2199) Receiving objects: 93% (2046/2199) Receiving objects: 94% (2068/2199) Receiving objects: 95% (2090/2199) Receiving objects: 96% (2112/2199) Receiving objects: 97% (2134/2199) Receiving objects: 98% (2156/2199) Receiving objects: 99% (2178/2199) Receiving objects: 100% (2199/2199) Receiving objects: 100% (2199/2199), 383.76 KiB, done. Resolving deltas: 0% (2/1874) Resolving deltas: 1% (19/1874) Resolving deltas: 5% (99/1874) Resolving deltas: 11% (209/1874) Resolving deltas: 12% (241/1874) Resolving deltas: 13% (249/1874) Resolving deltas: 14% (263/1874) Resolving deltas: 15% (290/1874) Resolving deltas: 16% (303/1874) Resolving deltas: 17% (323/1874) Resolving deltas: 20% (392/1874) Resolving deltas: 21% (410/1874) Resolving deltas: 22% (414/1874) Resolving deltas: 24% (460/1874) Resolving deltas: 39% (746/1874) Resolving deltas: 40% (753/1874) Resolving deltas: 53% (999/1874) Resolving deltas: 54% (1013/1874) Resolving deltas: 55% (1031/1874) Resolving deltas: 56% (1050/1874) Resolving deltas: 57% (1069/1874) Resolving deltas: 58% (1087/1874) Resolving deltas: 59% (1109/1874) Resolving deltas: 60% (1125/1874) Resolving deltas: 61% (1144/1874) Resolving deltas: 62% (1162/1874) Resolving deltas: 63% (1184/1874) Resolving deltas: 64% (1208/1874) Resolving deltas: 65% (1220/1874) Resolving deltas: 66% (1239/1874) Resolving deltas: 67% (1256/1874) Resolving deltas: 68% (1275/1874) Resolving deltas: 69% (1294/1874) Resolving deltas: 70% (1313/1874) Resolving deltas: 71% (1331/1874) Resolving deltas: 72% (1350/1874) Resolving deltas: 73% (1369/1874) Resolving deltas: 74% (1387/1874) Resolving deltas: 75% (1408/1874) Resolving deltas: 80% (1505/1874) Resolving deltas: 81% (1519/1874) Resolving deltas: 82% (1540/1874) Resolving deltas: 83% (1567/1874) Resolving deltas: 84% (1575/1874) Resolving deltas: 85% (1606/1874) Resolving deltas: 86% (1612/1874) Resolving deltas: 87% (1631/1874) Resolving deltas: 88% (1650/1874) Resolving deltas: 89% (1669/1874) Resolving deltas: 90% (1690/1874) Resolving deltas: 91% (1706/1874) Resolving deltas: 97% (1823/1874) Resolving deltas: 99% (1871/1874) Resolving deltas: 100% (1874/1874) Resolving deltas: 100% (1874/1874), completed with 296 local objects. From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 + 86c741b...eaec5b7 master -> x86 (forced update) Already on branch "2.6.25-rc4-mc8" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "doc" Switched to branch "2.6.25-rc4-mc8" Already on branch "2.6.25-rc4-mc8" Already on branch "2.6.25-rc4-mc8" Already on branch "2.6.25-rc4-mc8" rces.patch pci-arm-use-generic-pci_enable_resources.patch pci-cris-use-generic-pci_enable_resources.patch pci-frv-use-generic-pci_enable_resources.patch pci-ia64-use-generic-pci_enable_resources.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-sh-use-generic-pci_enable_resources.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch pci-replace-remaining-__function__-occurrences.patch ## # merge gregkh-pci resolve /home/jejb/gregkh-pci-fixup.diff ## Merge made by recursive. Documentation/ide/ide.txt | 2 - Documentation/kernel-parameters.txt | 6 +- Documentation/pci.txt | 4 +- arch/alpha/kernel/pci.c | 23 +- arch/arm/kernel/bios32.c | 27 +- arch/cris/arch-v32/drivers/pci/bios.c | 34 +-- arch/frv/mb93090-mb00/pci-frv.c | 32 -- arch/frv/mb93090-mb00/pci-frv.h | 3 - arch/frv/mb93090-mb00/pci-vdk.c | 55 +-- arch/ia64/pci/pci.c | 44 +-- arch/mips/pci/pci.c | 40 +-- arch/mn10300/unit-asb2305/pci-asb2305.c | 39 -- arch/mn10300/unit-asb2305/pci-asb2305.h | 3 - arch/mn10300/unit-asb2305/pci.c | 2 +- arch/parisc/kernel/pci.c | 30 +- arch/powerpc/kernel/pci-common.c | 34 +-- arch/powerpc/platforms/pseries/pci_dlpar.c | 7 +- arch/ppc/kernel/pci.c | 59 +-- arch/sh/drivers/pci/pci-sh4.h | 2 - arch/sh/drivers/pci/pci.c | 29 +- arch/sparc64/kernel/pci.c | 27 +- arch/v850/kernel/rte_mb_a_pci.c | 25 +- arch/x86/kernel/pci-calgary_64.c | 3 +- arch/x86/pci/acpi.c | 11 +- arch/x86/pci/common.c | 63 +--- arch/x86/pci/i386.c | 38 -- arch/x86/pci/pcbios.c | 72 --- arch/x86/pci/pci.h | 4 - arch/xtensa/kernel/pci.c | 57 +-- 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/acpi_pcihp.c | 24 +- drivers/pci/hotplug/acpiphp_core.c | 18 +- drivers/pci/hotplug/acpiphp_glue.c | 38 +- drivers/pci/hotplug/acpiphp_ibm.c | 36 +- drivers/pci/hotplug/cpci_hotplug_core.c | 60 +- drivers/pci/hotplug/cpci_hotplug_pci.c | 10 +- drivers/pci/hotplug/cpcihp_generic.c | 8 +- drivers/pci/hotplug/cpqphp.h | 6 +- drivers/pci/hotplug/cpqphp_core.c | 38 +- drivers/pci/hotplug/cpqphp_ctrl.c | 64 ++-- drivers/pci/hotplug/cpqphp_nvram.c | 2 +- drivers/pci/hotplug/cpqphp_pci.c | 8 +- drivers/pci/hotplug/fakephp.c | 2 +- drivers/pci/hotplug/ibmphp_core.c | 24 +- drivers/pci/hotplug/ibmphp_ebda.c | 92 ++-- drivers/pci/hotplug/ibmphp_hpc.c | 68 ++-- drivers/pci/hotplug/ibmphp_pci.c | 18 +- drivers/pci/hotplug/ibmphp_res.c | 12 +- drivers/pci/hotplug/pci_hotplug_core.c | 2 +- drivers/pci/hotplug/pciehp.h | 2 +- drivers/pci/hotplug/pciehp_core.c | 32 +- drivers/pci/hotplug/pciehp_ctrl.c | 34 +- drivers/pci/hotplug/pciehp_hpc.c | 144 +++--- drivers/pci/hotplug/pciehp_pci.c | 8 +- drivers/pci/hotplug/pcihp_skeleton.c | 18 +- drivers/pci/hotplug/rpadlpar_core.c | 20 +- drivers/pci/hotplug/rpaphp_core.c | 6 +- drivers/pci/hotplug/rpaphp_pci.c | 14 +- drivers/pci/hotplug/rpaphp_slot.c | 6 +- drivers/pci/hotplug/sgi_hotplug.c | 8 +- drivers/pci/hotplug/shpchp.h | 6 +- drivers/pci/hotplug/shpchp_core.c | 26 +- drivers/pci/hotplug/shpchp_ctrl.c | 46 +- drivers/pci/hotplug/shpchp_hpc.c | 64 ++-- drivers/pci/hotplug/shpchp_pci.c | 4 +- drivers/pci/pci-sysfs.c | 5 + drivers/pci/pci.c | 6 +- drivers/pci/pcie/Kconfig | 20 + drivers/pci/pcie/Makefile | 3 + drivers/pci/pcie/aer/aerdrv.c | 4 +- drivers/pci/pcie/aer/aerdrv_acpi.c | 3 + drivers/pci/pcie/aer/aerdrv_core.c | 5 +- drivers/pci/pcie/aspm.c | 811 ++++++++++++++++++++++++++++ drivers/pci/pcie/portdrv_core.c | 4 +- drivers/pci/pcie/portdrv_pci.c | 2 +- drivers/pci/probe.c | 65 +-- drivers/pci/remove.c | 14 +- drivers/pci/search.c | 313 +++++------- drivers/pci/setup-res.c | 45 ++- include/asm-sh/mpc1211/pci.h | 2 - include/linux/aer.h | 5 - include/linux/ide.h | 1 - include/linux/pci-aspm.h | 56 ++ include/linux/pci.h | 31 +- include/linux/pci_regs.h | 8 + 90 files changed, 1665 insertions(+), 1531 deletions(-) create mode 100644 drivers/pci/pcie/aspm.c create mode 100644 include/linux/pci-aspm.h WARNING: Merge successful but resolve requested ## # 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-check-serial-number-string-after-device-reset.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-cypress_m8-add-ups-powercom.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-drivers-usb-storage-sddr55.c-fix-uninitialized-var-warnings.patch usb-ehci-carry-out-port-handover-during-each-root-hub-resume.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-remove-obsolete-workaround-for-bogus-irqs.patch usb-ehci-tolerates-some-buggy-devices.patch usb-enable-usb-persist-by-default.patch usb-fix-usb-serial-generic-recursive-lock.patch usb-fsl_usb2_udc-fix-broken-kconfig.patch usb-ftdi_sio-note-missing-locking.patch usb-g_printer.h-does-not-need-to-be-unifdef-ed.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-io_ti.c-remove-unneeded-null-tty-check.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.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-persist-work-after-every-system-sleep.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-option-add-novatel-device-ids.patch usb-partial-usb-embedded-host-support.patch usb-remove-__kernel__-check-from-non-exported-gadget.h.patch usb-remove-config_usb_persist-setting.patch usb-remove-dev-power.power_state.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-reorganize-code-in-hub.c.patch usb-replace-remaining-__function__-occurrences.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 usb-usbaudio-handle-kcalloc-failure.patch usb-use-div_round_up.patch sent 4099151 bytes received 1302 bytes 8200906.00 bytes/sec total size is 4091872 speedup is 1.00 Using base gregkh-pci usb-fix-usb-serial-generic-recursive-lock.patch usb-drivers-usb-storage-sddr55.c-fix-uninitialized-var-warnings.patch usb-cypress_m8-add-ups-powercom.patch usb-usbaudio-handle-kcalloc-failure.patch usb-option-add-novatel-device-ids.patch usb-fsl_usb2_udc-fix-broken-kconfig.patch usb-g_printer.h-does-not-need-to-be-unifdef-ed.patch usb-remove-__kernel__-check-from-non-exported-gadget.h.patch usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-reorganize-code-in-hub.c.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-remove-config_usb_persist-setting.patch usb-check-serial-number-string-after-device-reset.patch usb-enable-usb-persist-by-default.patch 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-use-div_round_up.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-partial-usb-embedded-host-support.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-remove-dev-power.power_state.patch usb-add-usb-serial-spcp8x5-driver.patch usb-replace-remaining-__function__-occurrences.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-gotemp.patch usb-add-sensoray-2255-v4l-driver.patch ## # merge gregkh-usb ## Merge made by recursive. Documentation/usb/persist.txt | 43 +- drivers/usb/atm/cxacru.c | 2 +- drivers/usb/atm/ueagle-atm.c | 6 +- drivers/usb/atm/usbatm.c | 27 +- drivers/usb/atm/usbatm.h | 2 +- drivers/usb/class/cdc-acm.c | 8 +- drivers/usb/core/Kconfig | 38 +- drivers/usb/core/config.c | 17 + drivers/usb/core/devio.c | 42 +- drivers/usb/core/driver.c | 51 +- drivers/usb/core/hcd-pci.c | 5 - drivers/usb/core/hcd.h | 2 +- drivers/usb/core/hub.c | 274 +- drivers/usb/core/hub.h | 8 +- drivers/usb/core/inode.c | 4 +- drivers/usb/core/message.c | 10 +- drivers/usb/core/quirks.c | 14 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 2 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 2 +- drivers/usb/gadget/at91_udc.c | 4 +- drivers/usb/gadget/dummy_hcd.c | 14 +- drivers/usb/gadget/ether.c | 12 +- drivers/usb/gadget/file_storage.c | 8 +- drivers/usb/gadget/fsl_usb2_udc.c | 4 +- drivers/usb/gadget/fsl_usb2_udc.h | 2 +- drivers/usb/gadget/goku_udc.c | 20 +- drivers/usb/gadget/inode.c | 18 +- drivers/usb/gadget/lh7a40x_udc.c | 132 +- drivers/usb/gadget/m66592-udc.h | 2 +- drivers/usb/gadget/net2280.h | 2 +- drivers/usb/gadget/omap_udc.c | 20 +- drivers/usb/gadget/printer.c | 6 +- drivers/usb/gadget/pxa2xx_udc.c | 26 +- drivers/usb/gadget/rndis.c | 146 +- drivers/usb/gadget/serial.c | 3 +- drivers/usb/host/ehci-au1xxx.c | 5 +- drivers/usb/host/ehci-dbg.c | 4 +- drivers/usb/host/ehci-fsl.c | 9 +- drivers/usb/host/ehci-hcd.c | 62 +- drivers/usb/host/ehci-hub.c | 17 +- drivers/usb/host/ehci-ixp4xx.c | 3 +- drivers/usb/host/ehci-pci.c | 1 - drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-ps3.c | 1 - drivers/usb/host/ehci-q.c | 20 +- drivers/usb/host/ehci-sched.c | 46 +- drivers/usb/host/isp116x-hcd.c | 12 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-hub.c | 24 +- drivers/usb/host/ohci-omap.c | 2 - drivers/usb/host/ohci-ps3.c | 1 - drivers/usb/host/ohci-pxa27x.c | 2 - drivers/usb/host/ohci-sm501.c | 7 +- drivers/usb/host/pci-quirks.c | 6 +- drivers/usb/host/r8a66597-hcd.c | 8 +- drivers/usb/host/sl811-hcd.c | 12 +- drivers/usb/host/u132-hcd.c | 7 +- drivers/usb/host/uhci-hcd.c | 8 +- drivers/usb/host/uhci-q.c | 2 +- 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/adutux.c | 120 +- drivers/usb/misc/appledisplay.c | 6 +- drivers/usb/misc/auerswald.c | 135 +- drivers/usb/misc/emi26.c | 30 +- drivers/usb/misc/emi62.c | 32 +- drivers/usb/misc/ftdi-elan.c | 2 +- drivers/usb/misc/gotemp.c | 295 + drivers/usb/misc/iowarrior.c | 10 +- drivers/usb/misc/ldusb.c | 10 +- drivers/usb/misc/legousbtower.c | 92 +- drivers/usb/misc/phidgetkit.c | 6 +- drivers/usb/misc/phidgetmotorcontrol.c | 2 +- drivers/usb/misc/phidgetservo.c | 6 +- drivers/usb/misc/usblcd.c | 8 +- drivers/usb/misc/usbtest.c | 13 +- drivers/usb/serial/Kconfig | 10 + drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/aircable.c | 52 +- drivers/usb/serial/airprime.c | 34 +- drivers/usb/serial/ark3116.c | 6 +- drivers/usb/serial/belkin_sa.c | 20 +- drivers/usb/serial/console.c | 10 +- drivers/usb/serial/cp2101.c | 108 +- drivers/usb/serial/cyberjack.c | 78 +- drivers/usb/serial/cypress_m8.c | 448 +- drivers/usb/serial/cypress_m8.h | 4 + drivers/usb/serial/digi_acceleport.c | 44 +- drivers/usb/serial/empeg.c | 56 +- drivers/usb/serial/ezusb.c | 8 +- drivers/usb/serial/ftdi_sio.c | 168 +- drivers/usb/serial/garmin_gps.c | 112 +- drivers/usb/serial/generic.c | 58 +- drivers/usb/serial/io_edgeport.c | 326 +- drivers/usb/serial/io_ti.c | 392 +- drivers/usb/serial/ipaq.c | 54 +- drivers/usb/serial/ipw.c | 48 +- drivers/usb/serial/ir-usb.c | 50 +- drivers/usb/serial/iuu_phoenix.c | 162 +- drivers/usb/serial/keyspan.c | 262 +- drivers/usb/serial/keyspan_pda.c | 24 +- drivers/usb/serial/kl5kusb105.c | 82 +- drivers/usb/serial/kobil_sct.c | 71 +- drivers/usb/serial/mct_u232.c | 38 +- drivers/usb/serial/mos7720.c | 118 +- drivers/usb/serial/mos7840.c | 159 +- drivers/usb/serial/navman.c | 18 +- drivers/usb/serial/omninet.c | 36 +- drivers/usb/serial/option.c | 146 +- drivers/usb/serial/oti6858.c | 114 +- drivers/usb/serial/pl2303.c | 112 +- drivers/usb/serial/safe_serial.c | 30 +- drivers/usb/serial/sierra.c | 66 +- drivers/usb/serial/spcp8x5.c | 1076 + drivers/usb/serial/ti_usb_3410_5052.c | 205 +- drivers/usb/serial/usb-serial.c | 89 +- drivers/usb/serial/visor.c | 92 +- drivers/usb/serial/whiteheat.c | 110 +- drivers/usb/storage/Kconfig | 2 +- drivers/usb/storage/libusual.c | 14 +- drivers/usb/storage/scsiglue.c | 10 +- drivers/usb/storage/sddr55.c | 4 +- drivers/usb/storage/transport.c | 20 +- drivers/usb/storage/usb.c | 16 +- drivers/usb/usb-skeleton.c | 8 +- include/linux/usb.h | 166 +- include/linux/usb/Kbuild | 2 +- include/linux/usb/ch9.h | 14 +- include/linux/usb/gadget.h | 4 - sound/usb/usbaudio.c | 2 + 139 files changed, 47664 insertions(+), 2892 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 ## BRANCH linus not in tree /pub/scm/linux/kernel/git/perex/alsa.git, SKIPPING ## # 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 ## Removed arch/avr32/mach-at32ap/time-tc.c Removed include/asm-avr32/arch-at32ap/time.h Removed include/asm-avr32/intc.h Merge made by recursive. arch/avr32/Kconfig | 5 + arch/avr32/kernel/entry-avr32b.S | 20 -- arch/avr32/kernel/process.c | 4 +- arch/avr32/kernel/time.c | 248 +++++++++----------------- arch/avr32/mach-at32ap/Makefile | 3 +- arch/avr32/mach-at32ap/at32ap700x.c | 243 +++++++++++++++++++++++-- arch/avr32/mach-at32ap/intc.c | 1 - arch/avr32/mach-at32ap/pm-at32ap700x.S | 66 +++++++ arch/avr32/mach-at32ap/time-tc.c | 218 ----------------------- arch/avr32/oprofile/op_model_avr32.c | 1 - drivers/char/keyboard.c | 3 +- drivers/clocksource/Makefile | 1 + drivers/clocksource/tcb_clksrc.c | 305 ++++++++++++++++++++++++++++++++ drivers/misc/Kconfig | 33 ++++ drivers/misc/Makefile | 1 + drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ drivers/usb/gadget/atmel_usba_udc.c | 126 +++++--------- include/asm-avr32/arch-at32ap/board.h | 9 +- include/asm-avr32/arch-at32ap/pm.h | 48 +++++ include/asm-avr32/arch-at32ap/time.h | 112 ------------ include/asm-avr32/asm.h | 8 +- include/asm-avr32/intc.h | 128 ------------- include/asm-avr32/irq.h | 5 + include/asm-avr32/page.h | 8 +- include/asm-avr32/processor.h | 2 +- include/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ include/linux/usb/atmel_usba_udc.h | 22 +++ 27 files changed, 1268 insertions(+), 765 deletions(-) create mode 100644 arch/avr32/mach-at32ap/pm-at32ap700x.S delete mode 100644 arch/avr32/mach-at32ap/time-tc.c create mode 100644 drivers/clocksource/tcb_clksrc.c create mode 100644 drivers/misc/atmel_tclib.c create mode 100644 include/asm-avr32/arch-at32ap/pm.h delete mode 100644 include/asm-avr32/arch-at32ap/time.h delete mode 100644 include/asm-avr32/intc.h create mode 100644 include/linux/atmel_tc.h create mode 100644 include/linux/usb/atmel_usba_udc.h ## # git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master cifs ## Merge made by recursive. fs/cifs/inode.c | 133 +++++++++++++++++++++++++++++------------------------- 1 files changed, 71 insertions(+), 62 deletions(-) ## # git /pub/scm/linux/kernel/git/davej/cpufreq.git master cpufreq ## Merge made by recursive. drivers/acpi/processor_thermal.c | 30 +++++---- drivers/cpufreq/cpufreq.c | 129 +++++++++++++++++--------------------- drivers/cpufreq/cpufreq_stats.c | 6 ++- 3 files changed, 78 insertions(+), 87 deletions(-) ## # git /pub/scm/linux/kernel/git/agk/linux-2.6-dm.git master dm ## Already up-to-date. ## # gitfetch /pub/scm/linux/kernel/git/paulus/powerpc.git master powerpc ## ## # merge powerpc resolve /home/jejb/powerpc-fixup.diff ## Auto-merged arch/powerpc/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/Kconfig Auto-merged arch/powerpc/platforms/cell/iommu.c Auto-merged arch/sparc64/Kconfig Created commit 3a2f472: Resolve Patch: /home/jejb/powerpc-fixup.diff ## # 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 | 7 + 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/bt8xx/dvb-bt8xx.c | 4 +- drivers/media/dvb/dvb-core/dmxdev.c | 5 +- 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-cards.c | 2 + drivers/media/video/bt8xx/bttv-driver.c | 43 +- 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 | 460 ++++++++- 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 | 19 +- drivers/media/video/cx88/cx88.h | 7 + drivers/media/video/dabfirmware.h | 7 + drivers/media/video/dabusb.c | 8 +- drivers/media/video/dpc7146.c | 4 +- drivers/media/video/em28xx/em28xx-core.c | 8 +- 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 | 20 +- drivers/media/video/ivtv/ivtv-driver.c | 14 +- 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 | 9 +- 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-context.c | 116 ++- drivers/media/video/pvrusb2/pvrusb2-context.h | 8 +- drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 19 +- drivers/media/video/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 50 + drivers/media/video/pvrusb2/pvrusb2-devattr.h | 57 +- drivers/media/video/pvrusb2/pvrusb2-encoder.c | 10 - drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 9 + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 20 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 394 +++++++-- drivers/media/video/pvrusb2/pvrusb2-hdw.h | 23 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-std.c | 9 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 186 +++-- drivers/media/video/pwc/pwc-if.c | 8 +- drivers/media/video/pxa_camera.c | 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/sn9c102/sn9c102_sensor.h | 2 +- drivers/media/video/soc_camera.c | 999 ++++++++++++++++++++ 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-core.c | 2 + drivers/media/video/videobuf-dma-sg.c | 121 ++-- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 4 +- drivers/media/video/videocodec.c | 4 +- drivers/media/video/vino.c | 10 +- drivers/media/video/vpx3220.c | 2 +- drivers/media/video/w9966.c | 4 +- drivers/media/video/w9968cf.c | 2 +- drivers/media/video/zc0301/zc0301_core.c | 2 +- drivers/media/video/zoran_card.c | 6 +- drivers/media/video/zoran_device.c | 5 +- drivers/media/video/zoran_driver.c | 2 +- drivers/media/video/zr36016.c | 5 +- drivers/media/video/zr36050.c | 5 +- drivers/media/video/zr36060.c | 6 +- drivers/media/video/zr364xx.c | 4 +- include/asm-arm/arch-pxa/camera.h | 48 + include/asm-arm/arch-pxa/pxa-regs.h | 147 +++- include/linux/dvb/dmx.h | 3 +- include/linux/meye.h | 2 +- include/linux/videodev2.h | 52 +- include/media/soc_camera.h | 149 +++ include/media/v4l2-chip-ident.h | 6 + include/media/videobuf-dma-sg.h | 14 +- 186 files changed, 6951 insertions(+), 1350 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-rc4-git3 to 84c6f6046c5a2189160a8f0dca8b90427bf690ea Using base 84c6f6046c5a2189160a8f0dca8b90427bf690ea i2c-amd756-fix-off-by-one.patch i2c-fix-i2c_device_probe.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.patch i2c-ibm_iic-01-change-log-levels.patch i2c-ibm_iic-02-of-platform.patch i2c-dev-split-i2cdev_ioctl.patch i2c-bus-driver-for-sh7760-soc.patch i2c-replace-remaining-__FUNCTION__-occurrences.patch i2c-isp1301_omap-convert-to-new-style-1.patch ## # merge i2c ## Removed drivers/i2c/algos/i2c-algo-pca.h 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 | 11 +- drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-amd756.c | 2 +- drivers/i2c/busses/i2c-davinci.c | 6 +- drivers/i2c/busses/i2c-ibm_iic.c | 197 +++++++++++++- drivers/i2c/busses/i2c-pca-isa.c | 53 ++--- drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pnx.c | 44 ++-- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/busses/i2c-sh7760.c | 577 ++++++++++++++++++++++++++++++++++++++ drivers/i2c/chips/isp1301_omap.c | 87 +++--- drivers/i2c/i2c-core.c | 8 +- drivers/i2c/i2c-dev.c | 329 +++++++++++----------- include/asm-sh/i2c-sh7760.h | 22 ++ include/linux/i2c-algo-pca.h | 37 ++- 19 files changed, 1169 insertions(+), 405 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h create mode 100644 drivers/i2c/busses/i2c-sh7760.c create mode 100644 include/asm-sh/i2c-sh7760.h ## # git /pub/scm/linux/kernel/git/jikos/hid.git upstream hid-upstream ## Auto-merged drivers/hid/usbhid/hid-quirks.c Auto-merged include/linux/hid.h Merge made by recursive. drivers/hid/usbhid/hid-core.c | 40 ++++--- drivers/hid/usbhid/hid-quirks.c | 5 + drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- include/linux/hid.h | 1 + 4 files changed, 180 insertions(+), 152 deletions(-) ## # git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git master hrt ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git for-linus input ## 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 | 159 ++++++++++ arch/x86/kernel/setup_32.c | 5 + arch/x86/kernel/setup_64.c | 5 + arch/x86/kvm/Makefile | 3 +- arch/x86/kvm/i8254.c | 592 +++++++++++++++++++++++++++++++++++++ arch/x86/kvm/i8254.h | 61 ++++ arch/x86/kvm/irq.c | 3 + arch/x86/kvm/kvm_svm.h | 2 + arch/x86/kvm/lapic.c | 8 +- arch/x86/kvm/mmu.c | 417 +++++++++++++++++++++----- arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 70 +++-- arch/x86/kvm/segment_descriptor.h | 29 -- arch/x86/kvm/svm.c | 229 +++++++++++---- arch/x86/kvm/vmx.c | 132 +++++++-- arch/x86/kvm/vmx.h | 10 +- arch/x86/kvm/x86.c | 343 +++++++++++++++++----- arch/x86/kvm/x86_emulate.c | 256 +++++++++------- include/asm-x86/kvm.h | 21 ++ include/asm-x86/kvm_host.h | 40 ++- include/asm-x86/kvm_para.h | 25 ++ include/linux/kvm.h | 7 + include/linux/kvm_host.h | 14 +- virt/kvm/kvm_main.c | 91 +++++- 26 files changed, 2110 insertions(+), 429 deletions(-) create mode 100644 arch/x86/kernel/kvmclock.c create mode 100644 arch/x86/kvm/i8254.c create mode 100644 arch/x86/kvm/i8254.h delete mode 100644 arch/x86/kvm/segment_descriptor.h ## # git git://git.o-hand.com/linux-rpurdie-leds for-linus leds ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block for-linus block-for-linus ## Removed drivers/block/ps2esdi.c Removed include/linux/ps2esdi.h Merge made by recursive. Documentation/mca.txt | 17 +- block/Kconfig | 65 ++- block/Kconfig.iosched | 74 +++- drivers/block/Kconfig | 10 - drivers/block/Makefile | 1 - drivers/block/ps2esdi.c | 1079 ----------------------------------------------- include/linux/Kbuild | 1 - include/linux/ps2esdi.h | 98 ----- 8 files changed, 105 insertions(+), 1240 deletions(-) delete mode 100644 drivers/block/ps2esdi.c delete mode 100644 include/linux/ps2esdi.h ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-upstream-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-linus infiniband-for-linus ## Auto-merged MAINTAINERS Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c Merge made by recursive. MAINTAINERS | 2 +- drivers/infiniband/core/cm.c | 3 +- drivers/infiniband/core/fmr_pool.c | 38 +++++++++++++++----------- drivers/infiniband/hw/cxgb3/iwch_provider.c | 3 ++ 4 files changed, 28 insertions(+), 18 deletions(-) ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-2.6.26 infiniband ## Auto-merged drivers/infiniband/core/cm.c Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h Auto-merged drivers/infiniband/hw/mthca/mthca_provider.c Auto-merged include/rdma/ib_verbs.h Merge made by recursive. drivers/infiniband/core/addr.c | 8 +- drivers/infiniband/core/cm.c | 65 +++++--- drivers/infiniband/core/cma.c | 20 ++-- drivers/infiniband/hw/amso1100/c2.c | 80 +++++----- drivers/infiniband/hw/amso1100/c2.h | 10 +- drivers/infiniband/hw/amso1100/c2_mm.c | 2 +- drivers/infiniband/hw/amso1100/c2_mq.c | 4 +- drivers/infiniband/hw/amso1100/c2_mq.h | 2 +- drivers/infiniband/hw/amso1100/c2_rnic.c | 24 ++-- drivers/infiniband/hw/amso1100/c2_wr.h | 214 ++++++++++++------------ drivers/infiniband/hw/cxgb3/iwch.h | 2 +- drivers/infiniband/hw/ipath/ipath_driver.c | 4 +- drivers/infiniband/hw/ipath/ipath_init_chip.c | 8 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 2 +- drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/hw/mlx4/qp.c | 4 +- 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/infiniband/hw/nes/nes.c | 7 - drivers/infiniband/hw/nes/nes.h | 9 - drivers/infiniband/hw/nes/nes_cm.c | 4 +- drivers/net/mlx4/cmd.c | 3 +- include/rdma/ib_verbs.h | 2 +- 27 files changed, 257 insertions(+), 241 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 ## Merge made by recursive. arch/arm/common/it8152.c | 6 +- arch/arm/configs/omap_h2_1610_defconfig | 71 ++++++++++++----- arch/arm/configs/omap_osk_5912_defconfig | 123 +++++++++++++++++++++++------- arch/arm/kernel/head-common.S | 3 + arch/arm/kernel/head.S | 3 - arch/arm/kernel/kprobes.c | 5 + arch/arm/mach-at91/board-sam9263ek.c | 5 +- arch/arm/mach-at91/gpio.c | 7 ++ arch/arm/mach-h720x/common.c | 12 ++-- arch/arm/mach-imx/dma.c | 12 ++-- arch/arm/mach-imx/irq.c | 6 +- arch/arm/mach-iop13xx/iq81340mc.c | 2 +- arch/arm/mach-iop13xx/iq81340sc.c | 2 +- arch/arm/mach-iop13xx/pci.c | 8 +- arch/arm/mach-iop13xx/setup.c | 2 +- arch/arm/mach-ixp4xx/common-pci.c | 2 +- arch/arm/mach-ixp4xx/gtwx5715-pci.c | 2 +- arch/arm/mach-netx/generic.c | 6 +- arch/arm/mach-omap1/board-h2.c | 4 + arch/arm/mach-omap1/board-h3.c | 22 +++++ arch/arm/mach-omap1/pm.c | 2 +- arch/arm/mach-omap2/io.c | 6 ++ arch/arm/mach-orion/common.c | 20 +++++ arch/arm/mach-orion/common.h | 6 ++ arch/arm/mach-orion/dns323-setup.c | 1 + arch/arm/mach-orion/gpio.c | 12 ++-- arch/arm/mach-orion/kurobox_pro-setup.c | 1 + arch/arm/mach-orion/ts209-setup.c | 1 + arch/arm/mach-pnx4008/clock.c | 2 +- arch/arm/mach-pnx4008/dma.c | 2 +- arch/arm/mach-pxa/cm-x270-pci.c | 2 +- arch/arm/mach-pxa/cm-x270.c | 4 +- arch/arm/mach-pxa/dma.c | 2 +- arch/arm/mach-pxa/em-x270.c | 2 +- arch/arm/mach-pxa/mainstone.c | 4 +- arch/arm/mach-pxa/trizeps4.c | 8 +- arch/arm/mach-sa1100/badge4.c | 6 +- arch/arm/mach-sa1100/cpu-sa1100.c | 2 +- arch/arm/mach-sa1100/dma.c | 8 +- arch/arm/mach-sa1100/h3600.c | 14 ++-- arch/arm/plat-iop/pci.c | 2 +- arch/arm/plat-omap/cpu-omap.c | 32 +++----- arch/arm/plat-omap/devices.c | 63 --------------- arch/arm/plat-omap/dma.c | 14 +--- arch/arm/plat-omap/dmtimer.c | 2 +- arch/arm/plat-omap/gpio.c | 65 ++++++++++------ arch/arm/plat-s3c24xx/dma.c | 64 ++++++++-------- include/asm-arm/arch-omap/board-h3.h | 2 +- include/asm-arm/arch-omap/common.h | 9 ++- include/asm-arm/arch-omap/gpioexpander.h | 11 +++ include/asm-arm/pgtable-nommu.h | 2 + include/asm-arm/plat-s3c/uncompress.h | 4 +- include/asm-arm/proc-fns.h | 4 +- 53 files changed, 398 insertions(+), 284 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 ## Merge made by recursive. Documentation/debugging-via-ohci1394.txt | 13 +- drivers/firewire/fw-card.c | 40 +----- drivers/firewire/fw-cdev.c | 13 ++- drivers/firewire/fw-device.c | 261 ++++++++++++++++++++++++------ drivers/firewire/fw-device.h | 38 ++++-- drivers/firewire/fw-ohci.c | 114 ++++++++++--- drivers/firewire/fw-sbp2.c | 175 +++++++++++--------- drivers/firewire/fw-topology.c | 3 + drivers/firewire/fw-topology.h | 11 +- drivers/firewire/fw-transaction.c | 2 +- drivers/firewire/fw-transaction.h | 10 +- drivers/ieee1394/csr.c | 6 +- drivers/ieee1394/dv1394.c | 3 +- drivers/ieee1394/highlevel.c | 6 +- drivers/ieee1394/ieee1394_core.c | 2 +- drivers/ieee1394/nodemgr.c | 6 +- drivers/ieee1394/ohci1394.c | 111 ++++++------- drivers/ieee1394/pcilynx.c | 12 +- drivers/ieee1394/raw1394.c | 1 - drivers/ieee1394/sbp2.c | 11 +- drivers/ieee1394/video1394.c | 3 +- lib/Kconfig.debug | 10 ++ 22 files changed, 538 insertions(+), 313 deletions(-) ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-fixes-for-linus iop-fixes ## Already up-to-date. ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-for-linus iop ## Merge made by recursive. 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/dmaengine.c | 3 - drivers/dma/fsldma.c | 8 -- drivers/dma/ioat_dma.c | 12 -- drivers/dma/iop-adma.c | 53 ++++----- 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 +-- 12 files changed, 201 insertions(+), 128 deletions(-) ## # git git://www.linux-mips.org/pub/scm/upstream-linus.git upstream mips ## Already up-to-date. ## # git git://www.linux-mips.org/pub/scm/upstream.git master mips-devel ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-linus mmc ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-andrew mmc-devel ## Already up-to-date. ## # git git://git.infradead.org/mtd-2.6.git master mtd ## Merge made by recursive. drivers/mtd/onenand/onenand_base.c | 32 +++++++++++++++++--------------- fs/jffs2/fs.c | 14 +++++++++++--- 2 files changed, 28 insertions(+), 18 deletions(-) ## # git /pub/scm/linux/kernel/git/davem/net-2.6.26.git master net ## Auto-merged MAINTAINERS Removed drivers/net/wireless/rt2x00/rt2x00ring.h Removed net/mac80211/regdomain.c Merge made by recursive. MAINTAINERS | 32 +- drivers/net/Kconfig | 2 +- drivers/net/atarilance.c | 5 +- drivers/net/bonding/bond_main.c | 8 +- drivers/net/cxgb3/l2t.c | 2 +- drivers/net/e100.c | 29 +- drivers/net/ixgbe/ixgbe_main.c | 2 +- drivers/net/mv643xx_eth.c | 1 + drivers/net/niu.c | 701 ++++++++++++-- drivers/net/niu.h | 4 +- drivers/net/pcmcia/axnet_cs.c | 2 +- drivers/net/phy/Kconfig | 1 + drivers/net/phy/davicom.c | 17 +- drivers/net/s2io.c | 2 +- drivers/net/tulip/de2104x.c | 3 +- drivers/net/via-velocity.c | 23 +- drivers/net/wan/cosa.c | 14 +- drivers/net/wireless/Kconfig | 44 +- drivers/net/wireless/adm8211.c | 88 +- drivers/net/wireless/adm8211.h | 65 +-- drivers/net/wireless/ath5k/Kconfig | 37 + drivers/net/wireless/ath5k/Makefile | 8 +- drivers/net/wireless/ath5k/ath5k.h | 106 +-- drivers/net/wireless/ath5k/base.c | 417 +++++---- drivers/net/wireless/ath5k/base.h | 18 +- drivers/net/wireless/ath5k/debug.c | 55 +- drivers/net/wireless/ath5k/debug.h | 23 +- drivers/net/wireless/ath5k/hw.c | 172 +--- drivers/net/wireless/ath5k/initvals.c | 6 +- drivers/net/wireless/ath5k/phy.c | 88 +- drivers/net/wireless/atmel.c | 5 +- drivers/net/wireless/b43/b43.h | 79 +- drivers/net/wireless/b43/main.c | 428 +++++---- drivers/net/wireless/b43/main.h | 4 +- drivers/net/wireless/b43/sysfs.c | 89 +-- drivers/net/wireless/b43/xmit.c | 95 +- drivers/net/wireless/b43legacy/b43legacy.h | 46 +- drivers/net/wireless/b43legacy/main.c | 433 +++++---- drivers/net/wireless/b43legacy/xmit.c | 78 +- drivers/net/wireless/ipw2200.c | 4 +- drivers/net/wireless/iwlwifi/Kconfig | 17 +- drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 19 +- drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 1 - drivers/net/wireless/iwlwifi/iwl-3945-io.h | 39 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 90 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 38 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 22 +- drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 43 +- drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 1 - drivers/net/wireless/iwlwifi/iwl-4965-io.h | 39 +- drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 371 ++++++-- drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 12 + drivers/net/wireless/iwlwifi/iwl-4965.c | 865 ++++++------------ drivers/net/wireless/iwlwifi/iwl-4965.h | 119 +-- drivers/net/wireless/iwlwifi/iwl3945-base.c | 469 +++------- drivers/net/wireless/iwlwifi/iwl4965-base.c | 687 ++++--------- drivers/net/wireless/libertas/assoc.c | 20 +- drivers/net/wireless/libertas/assoc.h | 1 - drivers/net/wireless/libertas/cmd.c | 23 +- drivers/net/wireless/libertas/cmdresp.c | 6 +- drivers/net/wireless/libertas/debugfs.c | 2 +- drivers/net/wireless/libertas/dev.h | 4 +- drivers/net/wireless/libertas/join.c | 20 - drivers/net/wireless/libertas/join.h | 2 - drivers/net/wireless/libertas/main.c | 14 +- drivers/net/wireless/libertas/scan.c | 39 +- drivers/net/wireless/p54.h | 4 - drivers/net/wireless/p54common.c | 96 ++- drivers/net/wireless/p54common.h | 75 -- drivers/net/wireless/prism54/isl_ioctl.c | 46 +- drivers/net/wireless/prism54/islpci_dev.c | 2 +- drivers/net/wireless/prism54/islpci_dev.h | 6 +- drivers/net/wireless/rt2x00/Kconfig | 62 +- drivers/net/wireless/rt2x00/Makefile | 37 +- drivers/net/wireless/rt2x00/rt2400pci.c | 436 +++++---- drivers/net/wireless/rt2x00/rt2400pci.h | 8 +- drivers/net/wireless/rt2x00/rt2500pci.c | 442 +++++---- drivers/net/wireless/rt2x00/rt2500pci.h | 6 +- drivers/net/wireless/rt2x00/rt2500usb.c | 512 ++++++----- drivers/net/wireless/rt2x00/rt2500usb.h | 9 +- drivers/net/wireless/rt2x00/rt2x00.h | 339 ++++--- drivers/net/wireless/rt2x00/rt2x00config.c | 163 ++-- drivers/net/wireless/rt2x00/rt2x00debug.c | 124 ++- drivers/net/wireless/rt2x00/rt2x00debug.h | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 907 ++++++++---------- drivers/net/wireless/rt2x00/rt2x00dump.h | 8 +- drivers/net/wireless/rt2x00/rt2x00firmware.c | 43 +- drivers/net/wireless/rt2x00/rt2x00leds.c | 217 +++++ drivers/net/wireless/rt2x00/rt2x00leds.h | 63 ++ drivers/net/wireless/rt2x00/rt2x00lib.h | 101 ++- drivers/net/wireless/rt2x00/rt2x00mac.c | 243 +++-- drivers/net/wireless/rt2x00/rt2x00pci.c | 286 +++--- drivers/net/wireless/rt2x00/rt2x00pci.h | 67 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 299 ++++++ drivers/net/wireless/rt2x00/rt2x00queue.h | 457 +++++++++ drivers/net/wireless/rt2x00/rt2x00reg.h | 75 +-- drivers/net/wireless/rt2x00/rt2x00rfkill.c | 2 +- drivers/net/wireless/rt2x00/rt2x00ring.h | 290 ------ drivers/net/wireless/rt2x00/rt2x00usb.c | 324 ++++--- drivers/net/wireless/rt2x00/rt2x00usb.h | 161 +++- drivers/net/wireless/rt2x00/rt61pci.c | 640 +++++++------ drivers/net/wireless/rt2x00/rt61pci.h | 33 +- drivers/net/wireless/rt2x00/rt73usb.c | 521 ++++++----- drivers/net/wireless/rt2x00/rt73usb.h | 24 +- drivers/net/wireless/rtl8180.h | 2 +- drivers/net/wireless/rtl8180_dev.c | 103 ++- drivers/net/wireless/rtl8180_grf5101.c | 5 +- drivers/net/wireless/rtl8180_max2820.c | 5 +- drivers/net/wireless/rtl8180_rtl8225.c | 15 +- drivers/net/wireless/rtl8180_sa2400.c | 5 +- drivers/net/wireless/rtl8187.h | 2 +- drivers/net/wireless/rtl8187_dev.c | 92 ++- drivers/net/wireless/rtl8187_rtl8225.c | 15 +- drivers/net/wireless/rtl818x.h | 70 -- drivers/net/wireless/strip.c | 6 +- drivers/net/wireless/zd1211rw/zd_chip.c | 23 +- drivers/net/wireless/zd1211rw/zd_chip.h | 9 +- drivers/net/wireless/zd1211rw/zd_ieee80211.c | 11 +- drivers/net/wireless/zd1211rw/zd_mac.c | 172 ++-- drivers/net/wireless/zd1211rw/zd_mac.h | 2 +- drivers/s390/net/qeth_main.c | 3 + drivers/ssb/driver_chipcommon.c | 10 + drivers/ssb/main.c | 18 + drivers/ssb/pci.c | 28 + drivers/ssb/pcmcia.c | 32 + include/linux/icmpv6.h | 11 +- include/linux/if_arp.h | 6 + include/linux/inetdevice.h | 2 +- include/linux/nl80211.h | 99 ++ include/linux/skbuff.h | 5 +- include/linux/ssb/ssb.h | 10 + include/linux/ssb/ssb_driver_chipcommon.h | 4 + include/linux/udp.h | 1 + include/linux/xfrm.h | 3 +- include/net/addrconf.h | 28 +- include/net/cfg80211.h | 24 +- include/net/icmp.h | 2 +- include/net/inet_sock.h | 2 +- include/net/ip6_fib.h | 18 +- include/net/ip6_route.h | 30 +- include/net/ipv6.h | 15 +- include/net/llc_if.h | 5 - include/net/mac80211.h | 384 ++++---- include/net/ndisc.h | 4 +- include/net/neighbour.h | 6 - include/net/netns/ipv4.h | 2 + include/net/netns/ipv6.h | 15 + include/net/request_sock.h | 3 +- include/net/sctp/sctp.h | 5 - include/net/sctp/structs.h | 8 + include/net/sock.h | 13 + include/net/tcp.h | 10 +- include/net/tipc/tipc_bearer.h | 9 + include/net/tipc/tipc_port.h | 7 - include/net/wireless.h | 168 ++++ include/net/xfrm.h | 52 +- net/8021q/vlan_dev.c | 12 +- net/8021q/vlanproc.c | 2 +- net/9p/error.c | 2 +- net/Kconfig | 2 +- net/appletalk/aarp.c | 21 +- net/atm/clip.c | 4 - net/atm/lec.c | 29 +- net/atm/proc.c | 32 +- net/bridge/br_netfilter.c | 14 +- net/bridge/br_sysfs_br.c | 6 +- net/core/dev_mcast.c | 37 +- net/core/dst.c | 3 - net/core/neighbour.c | 7 +- net/core/netpoll.c | 6 +- net/core/sock.c | 21 +- net/dccp/dccp.h | 6 +- net/dccp/ipv4.c | 18 +- net/dccp/ipv6.c | 38 +- net/dccp/minisocks.c | 2 +- net/decnet/af_decnet.c | 21 +- net/ieee80211/softmac/ieee80211softmac_priv.h | 2 +- net/ipv4/af_inet.c | 14 +- net/ipv4/arp.c | 13 +- net/ipv4/devinet.c | 21 +- net/ipv4/icmp.c | 111 ++- net/ipv4/igmp.c | 41 +- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/ip_forward.c | 2 +- net/ipv4/ip_gre.c | 4 +- net/ipv4/ip_input.c | 2 +- net/ipv4/ip_options.c | 19 +- net/ipv4/ip_output.c | 10 +- net/ipv4/ip_sockglue.c | 2 +- net/ipv4/ipconfig.c | 7 +- net/ipv4/ipip.c | 2 +- net/ipv4/ipmr.c | 6 +- net/ipv4/ipvs/ip_vs_proto_tcp.c | 2 +- net/ipv4/ipvs/ip_vs_proto_udp.c | 2 +- net/ipv4/ipvs/ip_vs_sync.c | 4 +- net/ipv4/netfilter/arp_tables.c | 7 +- net/ipv4/netfilter/ip_tables.c | 2 +- net/ipv4/netfilter/ipt_MASQUERADE.c | 16 +- .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 2 +- net/ipv4/netfilter/nf_nat_helper.c | 4 +- net/ipv4/route.c | 97 ++- net/ipv4/syncookies.c | 11 +- net/ipv4/tcp_cubic.c | 35 +- net/ipv4/tcp_input.c | 3 +- net/ipv4/tcp_ipv4.c | 35 +- net/ipv4/tcp_minisocks.c | 4 +- net/ipv4/tcp_output.c | 1 + net/ipv4/udplite.c | 4 +- net/ipv6/Makefile | 1 + net/ipv6/addrconf.c | 198 ++-- net/ipv6/addrlabel.c | 19 +- net/ipv6/af_inet6.c | 175 +++- net/ipv6/anycast.c | 2 +- net/ipv6/fib6_rules.c | 103 ++- net/ipv6/icmp.c | 133 ++- net/ipv6/ip6_fib.c | 292 ++++-- net/ipv6/ip6_input.c | 5 - net/ipv6/ip6_output.c | 8 +- net/ipv6/ip6_tunnel.c | 8 +- net/ipv6/ipv6_sockglue.c | 122 --- net/ipv6/mcast.c | 72 +- net/ipv6/mip6.c | 20 +- net/ipv6/ndisc.c | 48 +- net/ipv6/netfilter.c | 4 +- net/ipv6/netfilter/ip6_tables.c | 2 +- net/ipv6/netfilter/ip6t_REJECT.c | 4 +- net/ipv6/proc.c | 3 + net/ipv6/route.c | 555 +++++++---- net/ipv6/sit.c | 6 +- net/ipv6/syncookies.c | 267 ++++++ net/ipv6/sysctl_net_ipv6.c | 15 +- net/ipv6/tcp_ipv6.c | 130 ++- net/ipv6/xfrm6_policy.c | 7 +- net/irda/af_irda.c | 178 ++-- net/irda/discovery.c | 4 +- net/irda/ircomm/ircomm_core.c | 46 +- net/irda/ircomm/ircomm_event.c | 12 +- net/irda/ircomm/ircomm_lmp.c | 30 +- net/irda/ircomm/ircomm_param.c | 32 +- net/irda/ircomm/ircomm_ttp.c | 26 +- net/irda/ircomm/ircomm_tty.c | 90 +- net/irda/ircomm/ircomm_tty_attach.c | 78 +- net/irda/ircomm/ircomm_tty_ioctl.c | 18 +- net/irda/irda_device.c | 18 +- net/irda/iriap.c | 76 +- net/irda/iriap_event.c | 38 +- net/irda/irias_object.c | 44 +- net/irda/irlan/irlan_client.c | 48 +- net/irda/irlan/irlan_client_event.c | 64 +- net/irda/irlan/irlan_common.c | 72 +- net/irda/irlan/irlan_eth.c | 18 +- net/irda/irlan/irlan_event.c | 4 +- net/irda/irlan/irlan_filter.c | 4 +- net/irda/irlan/irlan_provider.c | 30 +- net/irda/irlan/irlan_provider_event.c | 16 +- net/irda/irlap.c | 56 +- net/irda/irlap_event.c | 122 ++-- net/irda/irlap_frame.c | 74 +- net/irda/irlmp.c | 112 ++-- net/irda/irlmp_event.c | 94 +- net/irda/irlmp_frame.c | 36 +- net/irda/irmod.c | 2 +- net/irda/irnet/irnet.h | 10 +- net/irda/irnetlink.c | 4 +- net/irda/irqueue.c | 8 +- net/irda/irttp.c | 108 ++-- net/irda/parameters.c | 42 +- net/irda/qos.c | 24 +- net/irda/wrapper.c | 18 +- net/key/af_key.c | 120 ++- net/llc/af_llc.c | 16 +- net/llc/llc_c_ac.c | 2 +- net/llc/llc_c_ev.c | 8 +- net/llc/llc_conn.c | 24 +- net/llc/llc_input.c | 4 +- net/mac80211/Makefile | 1 - net/mac80211/cfg.c | 68 +- net/mac80211/debugfs.c | 47 +- net/mac80211/debugfs_netdev.c | 9 - net/mac80211/debugfs_sta.c | 170 +++- net/mac80211/ieee80211.c | 825 ++++++++++++---- net/mac80211/ieee80211_i.h | 164 +--- net/mac80211/ieee80211_iface.c | 12 +- net/mac80211/ieee80211_ioctl.c | 217 +++-- net/mac80211/ieee80211_key.h | 26 +- net/mac80211/ieee80211_rate.c | 15 +- net/mac80211/ieee80211_rate.h | 28 +- net/mac80211/ieee80211_sta.c | 1004 +++++++++++++------- net/mac80211/key.c | 171 +++- net/mac80211/rc80211_pid_algo.c | 86 +- net/mac80211/rc80211_simple.c | 72 +- net/mac80211/regdomain.c | 152 --- net/mac80211/rx.c | 572 ++++++----- net/mac80211/sta_info.c | 168 +++-- net/mac80211/sta_info.h | 110 ++- net/mac80211/tx.c | 335 ++++--- net/mac80211/util.c | 142 +--- net/mac80211/wep.c | 16 +- net/mac80211/wep.h | 4 +- net/mac80211/wme.c | 135 +++- net/mac80211/wme.h | 23 +- net/mac80211/wpa.c | 72 +- net/mac80211/wpa.h | 12 +- net/netfilter/nf_conntrack_netbios_ns.c | 2 +- net/netfilter/nf_conntrack_standalone.c | 2 +- net/netlink/af_netlink.c | 26 +- net/rxrpc/ar-internal.h | 8 +- net/rxrpc/ar-proc.c | 4 +- net/sched/em_meta.c | 4 +- net/sctp/associola.c | 8 +- net/sctp/chunk.c | 2 +- net/sctp/input.c | 2 +- net/sctp/ipv6.c | 13 +- net/sctp/output.c | 14 +- net/sctp/outqueue.c | 17 +- net/sctp/proc.c | 20 +- net/sctp/protocol.c | 15 +- net/sctp/sm_sideeffect.c | 6 +- net/sctp/sm_statefuns.c | 12 +- net/sctp/socket.c | 14 +- net/sctp/transport.c | 10 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/clnt.c | 44 +- net/sunrpc/rpc_pipe.c | 12 +- net/sunrpc/rpcb_clnt.c | 20 +- net/sunrpc/xprtsock.c | 2 +- net/tipc/core.c | 11 +- net/tipc/core.h | 6 + net/tipc/link.c | 16 +- net/tipc/msg.c | 16 +- net/tipc/msg.h | 50 +- net/tipc/port.c | 12 +- net/tipc/socket.c | 61 +- net/unix/af_unix.c | 2 +- net/wireless/Makefile | 2 +- net/wireless/core.c | 41 + net/wireless/core.h | 3 + net/wireless/nl80211.c | 118 +++- net/wireless/reg.c | 159 +++ net/wireless/util.c | 98 ++ net/xfrm/xfrm_policy.c | 79 +- net/xfrm/xfrm_state.c | 53 +- net/xfrm/xfrm_user.c | 71 +- 343 files changed, 14534 insertions(+), 10886 deletions(-) create mode 100644 drivers/net/wireless/ath5k/Kconfig create mode 100644 drivers/net/wireless/rt2x00/rt2x00leds.c create mode 100644 drivers/net/wireless/rt2x00/rt2x00leds.h create mode 100644 drivers/net/wireless/rt2x00/rt2x00queue.c create mode 100644 drivers/net/wireless/rt2x00/rt2x00queue.h delete mode 100644 drivers/net/wireless/rt2x00/rt2x00ring.h create mode 100644 net/ipv6/syncookies.c delete mode 100644 net/mac80211/regdomain.c create mode 100644 net/wireless/reg.c create mode 100644 net/wireless/util.c ## # git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git linux-next nfs ## Auto-merged fs/nfs/inode.c Auto-merged fs/nfs/internal.h Auto-merged fs/nfs/write.c Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/clnt.c Auto-merged net/sunrpc/rpcb_clnt.c Auto-merged net/sunrpc/xprtsock.c Merge made by recursive. fs/nfs/client.c | 2 + fs/nfs/direct.c | 9 +- fs/nfs/inode.c | 43 +++++++- fs/nfs/internal.h | 1 + fs/nfs/nfs4proc.c | 10 ++- fs/nfs/nfs4state.c | 8 +- fs/nfs/read.c | 16 +-- fs/nfs/write.c | 63 +++++----- include/linux/sunrpc/clnt.h | 9 +- include/linux/sunrpc/sched.h | 41 +++---- net/sunrpc/auth_gss/auth_gss.c | 5 +- net/sunrpc/clnt.c | 8 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 255 ++++++++++++++++++---------------------- net/sunrpc/xprt.c | 45 ++++--- net/sunrpc/xprtsock.c | 7 +- 16 files changed, 281 insertions(+), 243 deletions(-) ## # git git://git.linux-nfs.org/~bfields/linux.git for-linus nfsd-for-linus ## Already up-to-date. ## # git git://git.linux-nfs.org/~bfields/linux.git for-2.6.26 nfsd ## Auto-merged fs/nfsd/export.c Auto-merged fs/nfsd/nfsctl.c Auto-merged include/net/ipv6.h Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/svcauth_unix.c Merge made by recursive. fs/nfs/symlink.c | 1 - fs/nfsd/export.c | 9 ++- fs/nfsd/nfsctl.c | 15 +++++- include/linux/nfs3.h | 2 +- include/linux/sunrpc/svcauth.h | 4 +- include/net/ipv6.h | 9 +++ net/sunrpc/auth_gss/auth_gss.c | 39 ++++++++----- net/sunrpc/svcauth_unix.c | 118 +++++++++++++++++++++++++++------------- 8 files changed, 135 insertions(+), 62 deletions(-) ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus s390-linus ## Already up-to-date. ## # 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 | 34 ++++++++++++++++++++++++++++++++++ drivers/s390/block/dasd_eckd.c | 7 +++++++ drivers/s390/block/dasd_int.h | 6 ++++++ 3 files changed, 47 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 ## Merge made by recursive. Documentation/ABI/obsolete/o2cb | 11 + Documentation/ABI/stable/o2cb | 10 + Documentation/feature-removal-schedule.txt | 10 + fs/ocfs2/alloc.c | 465 +++++++++++++++++++++++++--- fs/ocfs2/cluster/sys.c | 9 + fs/ocfs2/cluster/tcp.c | 60 +++-- fs/ocfs2/cluster/tcp_internal.h | 2 + fs/ocfs2/dlm/dlmcommon.h | 21 +- fs/ocfs2/dlm/dlmconvert.c | 2 +- fs/ocfs2/dlm/dlmdomain.c | 103 ++++--- fs/ocfs2/dlm/dlmmaster.c | 18 +- fs/ocfs2/dlm/dlmrecovery.c | 57 +++- fs/ocfs2/dlm/dlmthread.c | 6 +- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/file.c | 4 +- fs/ocfs2/ioctl.c | 12 +- fs/ocfs2/ioctl.h | 3 +- fs/ocfs2/journal.c | 3 +- fs/ocfs2/localalloc.c | 4 + fs/ocfs2/namei.c | 4 +- fs/ocfs2/ocfs2.h | 34 ++- fs/ocfs2/resize.c | 2 +- fs/ocfs2/suballoc.c | 103 ++++++- fs/ocfs2/suballoc.h | 1 + fs/ocfs2/super.c | 1 + fs/sysfs/symlink.c | 9 +- 26 files changed, 795 insertions(+), 161 deletions(-) create mode 100644 Documentation/ABI/obsolete/o2cb create mode 100644 Documentation/ABI/stable/o2cb ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-linus selinux-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git next selinux ## BRANCH next not in tree /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git, SKIPPING ## # git /pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git master sched ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/lethal/sh-2.6.git master sh ## Merge made by recursive. arch/sh/boards/renesas/migor/setup.c | 56 +++++++- arch/sh/boards/se/7722/setup.c | 41 +++++ drivers/input/keyboard/Kconfig | 9 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/sh_keysc.c | 281 ++++++++++++++++++++++++++++++++ drivers/rtc/rtc-sh.c | 296 +++++++++++++++++++++------------- include/asm-sh/se7722.h | 2 + include/asm-sh/sh_keysc.h | 13 ++ 8 files changed, 589 insertions(+), 110 deletions(-) create mode 100644 drivers/input/keyboard/sh_keysc.c create mode 100644 include/asm-sh/sh_keysc.h ## # git /pub/scm/linux/kernel/git/ericvh/v9fs for-linus v9fs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ericvh/v9fs v9fs-devel v9fs-devel ## Auto-merged net/9p/error.c Merge made by recursive. fs/9p/fid.h | 15 +++ fs/9p/v9fs.c | 52 ++++++++-- fs/9p/v9fs.h | 85 +++++++++++----- fs/9p/vfs_addr.c | 2 +- fs/9p/vfs_dir.c | 2 +- fs/9p/vfs_file.c | 11 +- fs/9p/vfs_inode.c | 50 +++++++--- fs/9p/vfs_super.c | 1 + include/linux/parser.h | 2 +- include/net/9p/9p.h | 239 ++++++++++++++++++++++++++++++++++++++------ include/net/9p/client.h | 35 +++++++ include/net/9p/transport.h | 43 ++++++++ lib/parser.c | 32 ++++-- net/9p/client.c | 32 +++++-- net/9p/conv.c | 128 +++++++++++++++++++++++- net/9p/error.c | 11 ++- net/9p/fcprint.c | 8 ++ net/9p/mod.c | 7 +- net/9p/trans_fd.c | 175 +++++++++++++++++++++++++++------ net/9p/trans_virtio.c | 173 ++++++++++++++++++++++++++++---- net/9p/util.c | 32 +++++- 21 files changed, 966 insertions(+), 169 deletions(-) ## # git /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git master watchdog ## Merge made by recursive. drivers/watchdog/cpu5wdt.c | 4 +- drivers/watchdog/hpwdt.c | 214 +++++----------------------------------- drivers/watchdog/it8712f_wdt.c | 78 ++++++++++++--- drivers/watchdog/machzwd.c | 2 +- drivers/watchdog/mtx-1_wdt.c | 4 +- drivers/watchdog/pcwd_usb.c | 4 +- drivers/watchdog/s3c2410_wdt.c | 8 +- drivers/watchdog/shwdt.c | 2 +- 8 files changed, 100 insertions(+), 216 deletions(-) ## # git git://oss.sgi.com:8090/xfs/xfs-2.6.git master xfs ## Auto-merged fs/xfs/xfs_iget.c Merge made by recursive. fs/xfs/linux-2.6/xfs_aops.c | 4 +- fs/xfs/linux-2.6/xfs_export.c | 11 +- fs/xfs/linux-2.6/xfs_file.c | 13 +- fs/xfs/linux-2.6/xfs_fs_subr.c | 36 +-- fs/xfs/linux-2.6/xfs_ioctl.c | 562 +++++++++++++++------------------- fs/xfs/linux-2.6/xfs_iops.c | 180 ++++++------ fs/xfs/linux-2.6/xfs_linux.h | 1 - fs/xfs/linux-2.6/xfs_lrw.c | 53 ++-- fs/xfs/linux-2.6/xfs_super.c | 3 +- fs/xfs/linux-2.6/xfs_vnode.h | 19 +- fs/xfs/quota/xfs_qm.c | 6 +- fs/xfs/quota/xfs_qm_bhv.c | 2 +- fs/xfs/quota/xfs_qm_syscalls.c | 4 +- fs/xfs/support/ktrace.c | 37 ++-- fs/xfs/support/ktrace.h | 3 +- fs/xfs/xfs_attr_leaf.c | 6 +- fs/xfs/xfs_bmap.c | 26 +- fs/xfs/xfs_bmap_btree.h | 2 +- fs/xfs/xfs_dir2.c | 2 +- fs/xfs/xfs_fsops.c | 24 +- fs/xfs/xfs_ialloc.c | 6 +- fs/xfs/xfs_iget.c | 49 +--- fs/xfs/xfs_inode.c | 661 ++++++++++++++++++++-------------------- fs/xfs/xfs_inode.h | 23 +-- fs/xfs/xfs_inode_item.c | 4 +- fs/xfs/xfs_inode_item.h | 8 + fs/xfs/xfs_itable.c | 5 +- fs/xfs/xfs_log.c | 61 ++-- fs/xfs/xfs_log_priv.h | 6 +- fs/xfs/xfs_log_recover.c | 19 +- fs/xfs/xfs_mount.c | 49 ++- fs/xfs/xfs_mount.h | 24 +- fs/xfs/xfs_rename.c | 45 +-- fs/xfs/xfs_sb.h | 106 +++---- fs/xfs/xfs_trans.h | 1 - fs/xfs/xfs_trans_buf.c | 3 +- fs/xfs/xfs_utils.c | 28 +-- fs/xfs/xfs_utils.h | 1 - fs/xfs/xfs_vfsops.c | 38 +-- fs/xfs/xfs_vnodeops.c | 328 ++++++--------------- fs/xfs/xfs_vnodeops.h | 14 +- 41 files changed, 1042 insertions(+), 1431 deletions(-) ## # git /pub/scm/linux/kernel/git/czankel/xtensa-2.6.git testing xtensa ## Removed arch/xtensa/boot/ramdisk/Makefile Merge made by recursive. arch/xtensa/Kconfig | 65 ++++++++++++++++++++++++----------- arch/xtensa/Makefile | 68 +++++++++++++----------------------- arch/xtensa/boot/ramdisk/Makefile | 23 ------------ 3 files changed, 69 insertions(+), 87 deletions(-) delete mode 100644 arch/xtensa/boot/ramdisk/Makefile ## # gitfetch /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## ## # merge x86 resolve /home/jejb/x86-fixup.diff ## Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/arm/Kconfig Auto-merged arch/x86/Kconfig Auto-merged arch/x86/kernel/Makefile Auto-merged arch/x86/kernel/setup_32.c Auto-merged arch/x86/kernel/setup_64.c Removed arch/x86/kernel/smp_32.c Removed arch/x86/kernel/smp_64.c Auto-merged arch/x86/kernel/traps_32.c Auto-merged arch/x86/kernel/traps_64.c Removed arch/x86/lib/bitops_32.c Removed arch/x86/mach-rdc321x/wdt.c Removed arch/x86/mm/Makefile_32 Removed arch/x86/mm/Makefile_64 Auto-merged arch/x86/pci/acpi.c CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c Auto-merged arch/x86/pci/common.c Auto-merged arch/x86/pci/pci.h CONFLICT (content): Merge conflict in arch/x86/pci/pci.h Auto-merged drivers/base/core.c Auto-merged drivers/pci/probe.c Removed include/asm-x86/mach-default/mach_reboot.h Auto-merged include/linux/ide.h Auto-merged include/linux/pci.h Auto-merged include/linux/skbuff.h Auto-merged include/net/inet_sock.h Auto-merged include/net/tcp.h Auto-merged init/main.c Auto-merged lib/Kconfig.debug Created commit f1c8e73: Resolve Patch: /home/jejb/x86-fixup.diff ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git release ia64-release ## Already up-to-date. ## # quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ doc ## 2.6.25-rc3-git6 to 87baa2bb904ed46f872385fe430b6cfb80967835 Using base 87baa2bb904ed46f872385fe430b6cfb80967835 docbook-audit-prms.patch docsrc-spi-split-fix.patch kconfig_allconfig_docv2.patch doc-pci-subdir.patch doc-move-power.patch move-smart-config.patch doc-move-laptop-mode.patch kerndoc-env-set-verbose.patch kerndoc-dup-section-name-err.patch ## # merge doc ## Renamed Documentation/pci.txt => Documentation/PCI/pci.txt Auto-merged Documentation/PCI/pci.txt Auto-merged Documentation/00-INDEX Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/x86/Kconfig Merge made by recursive. Documentation/00-INDEX | 16 -- Documentation/PCI/00-INDEX | 10 ++ Documentation/{ => PCI}/PCIEBUS-HOWTO.txt | 12 +- Documentation/{ => PCI}/pci-error-recovery.txt | 0 Documentation/{ => PCI}/pci.txt | 2 +- Documentation/{ => PCI}/pcieaer-howto.txt | 4 +- Documentation/filesystems/proc.txt | 4 +- Documentation/kbuild/00-INDEX | 4 + Documentation/kbuild/make-configs.txt | 188 ++++++++++++++++++++++ Documentation/{ => kbuild}/smart-config.txt | 2 +- Documentation/kernel-parameters.txt | 2 +- Documentation/laptops/00-INDEX | 2 + Documentation/{ => laptops}/laptop-mode.txt | 0 Documentation/memory-barriers.txt | 2 +- Documentation/power/00-INDEX | 6 + Documentation/{ => power}/pm.txt | 2 +- Documentation/{ => power}/pm_qos_interface.txt | 0 Documentation/{ => power}/power_supply_class.txt | 0 Documentation/spi/spidev | 168 +------------------- Documentation/spi/spidev_fdx.c | 158 ++++++++++++++++++ README | 32 +++-- arch/x86/Kconfig | 2 +- kernel/audit.c | 4 +- kernel/power/Kconfig | 2 +- scripts/kernel-doc | 24 ++- 25 files changed, 426 insertions(+), 220 deletions(-) create mode 100644 Documentation/PCI/00-INDEX rename Documentation/{ => PCI}/PCIEBUS-HOWTO.txt (98%) rename Documentation/{ => PCI}/pci-error-recovery.txt (100%) rename Documentation/{ => PCI}/pci.txt (99%) rename Documentation/{ => PCI}/pcieaer-howto.txt (98%) create mode 100644 Documentation/kbuild/make-configs.txt rename Documentation/{ => kbuild}/smart-config.txt (99%) rename Documentation/{ => laptops}/laptop-mode.txt (100%) rename Documentation/{ => power}/pm.txt (99%) rename Documentation/{ => power}/pm_qos_interface.txt (100%) rename Documentation/{ => power}/power_supply_class.txt (100%) create mode 100644 Documentation/spi/spidev_fdx.c ## # git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git testing lm-sensors ## Merge made by recursive. Documentation/hwmon/w83l785ts | 3 ++- drivers/hwmon/asb100.c | 4 ---- drivers/hwmon/dme1737.c | 5 +++++ drivers/hwmon/f71805f.c | 5 +++++ drivers/hwmon/f71882fg.c | 5 +++++ drivers/hwmon/it87.c | 5 +++++ drivers/hwmon/lm75.c | 5 +---- drivers/hwmon/pc87360.c | 6 ++++++ drivers/hwmon/pc87427.c | 5 +++++ drivers/hwmon/sis5595.c | 5 +++++ drivers/hwmon/smsc47b397.c | 22 +++++++++++++++++++--- drivers/hwmon/smsc47m1.c | 5 +++++ drivers/hwmon/via686a.c | 5 +++++ drivers/hwmon/vt1211.c | 5 +++++ drivers/hwmon/vt8231.c | 5 +++++ drivers/hwmon/w83627ehf.c | 6 ++++++ drivers/hwmon/w83627hf.c | 5 +++++ drivers/hwmon/w83793.c | 26 ++++++++++++++------------ drivers/hwmon/w83l785ts.c | 4 ++-- 19 files changed, 105 insertions(+), 26 deletions(-) ## # git git://git.infradead.org/~dedekind/ubi-2.6.git master ubi ## Merge made by recursive. Documentation/ABI/stable/sysfs-class-ubi | 212 ++++++++++++++++++++ drivers/mtd/ubi/build.c | 18 +- drivers/mtd/ubi/debug.h | 2 + drivers/mtd/ubi/io.c | 4 + .../ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 +- drivers/mtd/ubi/ubi.h | 3 +- include/mtd/Kbuild | 1 - 7 files changed, 231 insertions(+), 17 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-class-ubi rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) ## # git /pub/scm/linux/kernel/git/teigland/dlm.git next dlm ## Merge made by recursive. fs/dlm/config.c | 2 +- fs/dlm/lock.c | 5 ++--- fs/dlm/lock.h | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) ## # git /pub/scm/linux/kernel/git/kyle/parisc-2.6.git master parisc ## Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 9 ++++++ arch/parisc/Makefile | 3 ++ .../{defconfig => configs/default_defconfig} | 0 arch/parisc/kernel/firmware.c | 27 +++++++++++------ arch/parisc/kernel/hardware.c | 13 ++++++++- arch/parisc/kernel/head.S | 7 ++-- arch/parisc/kernel/pdc_cons.c | 30 ++++++++++--------- arch/parisc/kernel/syscall_table.S | 5 ++- arch/parisc/kernel/traps.c | 25 ++++++++++++++-- drivers/parisc/pdc_stable.c | 6 ++-- include/asm-parisc/elf.h | 22 ++++++-------- include/asm-parisc/fixmap.h | 9 +++++- include/asm-parisc/futex.h | 10 +++++- include/asm-parisc/pdc.h | 3 +- include/asm-parisc/pgalloc.h | 4 +- include/asm-parisc/pgtable.h | 8 ----- include/asm-parisc/unistd.h | 5 ++- 17 files changed, 123 insertions(+), 63 deletions(-) rename arch/parisc/{defconfig => configs/default_defconfig} (100%) ## # git /pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git for-linus blackfinquilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/ m68k ## Already up-to-date. ## # merge m68k ## MERGE m68k not in tree, SKIPPING ## # git /pub/scm/linux/kernel/git/tytso/ext4.git next ext4 ## Merge made by recursive. fs/ext4/balloc.c | 29 +++++-- fs/ext4/dir.c | 2 +- fs/ext4/extents.c | 203 +++++++++++++++++++++++++++++++++++++++++--- fs/ext4/file.c | 21 ++++- fs/ext4/fsync.c | 3 + fs/ext4/ialloc.c | 112 ++++++++++++++++++++++-- fs/ext4/inode.c | 35 ++++---- fs/ext4/ioctl.c | 12 +-- fs/ext4/mballoc.c | 63 ++++++-------- fs/ext4/namei.c | 11 ++- fs/ext4/resize.c | 6 +- fs/ext4/super.c | 63 +++++++++++++- fs/ext4/xattr.c | 16 ++-- fs/ext4/xattr.h | 7 -- fs/jbd2/commit.c | 19 +---- fs/jbd2/journal.c | 13 ++-- fs/jbd2/revoke.c | 4 +- fs/jbd2/transaction.c | 34 +++++++- include/linux/ext4_fs.h | 29 ++++++- include/linux/ext4_fs_sb.h | 3 + 20 files changed, 534 insertions(+), 151 deletions(-) ## # git /pub/scm/linux/kernel/git/jack/linux-udf-2.6.git for_next udf ## Auto-merged include/linux/Kbuild Removed include/linux/udf_fs.h Removed include/linux/udf_fs_sb.h Merge made by recursive. fs/udf/balloc.c | 13 +- fs/udf/crc.c | 4 +- fs/udf/dir.c | 83 ++---- fs/udf/ecma_167.h | 13 - fs/udf/file.c | 47 --- fs/udf/ialloc.c | 13 +- fs/udf/inode.c | 187 +++--------- fs/udf/lowlevel.c | 1 - fs/udf/misc.c | 1 - fs/udf/namei.c | 197 +++++--------- fs/udf/partition.c | 1 - fs/udf/super.c | 697 +++++++++++++++++++-------------------------- fs/udf/symlink.c | 1 - fs/udf/truncate.c | 81 ++---- fs/udf/udf_i.h | 30 ++- fs/udf/udf_sb.h | 93 ++++++ fs/udf/udfdecl.h | 64 +++-- fs/udf/udfend.h | 22 -- fs/udf/udftime.c | 35 ++-- fs/udf/unicode.c | 59 ++--- include/linux/Kbuild | 2 +- include/linux/udf_fs.h | 51 ---- include/linux/udf_fs_i.h | 31 -- include/linux/udf_fs_sb.h | 117 -------- 24 files changed, 682 insertions(+), 1161 deletions(-) delete mode 100644 include/linux/udf_fs.h delete mode 100644 include/linux/udf_fs_sb.h ## # gitfetch /pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git next powerpc-4xx ## ## # merge powerpc-4xx resolve /home/jejb/powerpc-4xx-fixup.diff ## Auto-merged arch/powerpc/boot/cuboot-taishan.c Auto-merged arch/powerpc/boot/cuboot-warp.c Merge made by recursive. Documentation/powerpc/booting-without-of.txt | 16 - arch/powerpc/boot/Makefile | 3 +- arch/powerpc/boot/bamboo.c | 3 +- arch/powerpc/boot/cuboot-rainier.c | 3 +- arch/powerpc/boot/cuboot-sequoia.c | 3 +- arch/powerpc/boot/cuboot-taishan.c | 3 +- arch/powerpc/boot/cuboot-warp.c | 2 +- arch/powerpc/boot/cuboot-yosemite.c | 44 ++ arch/powerpc/boot/dts/bamboo.dts | 2 - arch/powerpc/boot/dts/canyonlands.dts | 391 ++++++++++++++ arch/powerpc/boot/dts/ebony.dts | 2 - arch/powerpc/boot/dts/rainier.dts | 2 - arch/powerpc/boot/dts/sequoia.dts | 2 - arch/powerpc/boot/dts/taishan.dts | 4 - arch/powerpc/boot/dts/walnut.dts | 1 - arch/powerpc/boot/dts/warp.dts | 1 - arch/powerpc/boot/dts/yosemite.dts | 304 +++++++++++ arch/powerpc/boot/ebony.c | 3 +- arch/powerpc/boot/treeboot-walnut.c | 2 +- arch/powerpc/configs/canyonlands_defconfig | 721 ++++++++++++++++++++++++++ arch/powerpc/kernel/cpu_setup_44x.S | 5 +- arch/powerpc/kernel/cputable.c | 28 +- arch/powerpc/platforms/44x/Kconfig | 27 + arch/powerpc/platforms/44x/Makefile | 2 + arch/powerpc/platforms/44x/canyonlands.c | 64 +++ arch/powerpc/sysdev/ppc4xx_pci.c | 114 ++++ arch/powerpc/sysdev/ppc4xx_pci.h | 59 +++ 27 files changed, 1771 insertions(+), 40 deletions(-) create mode 100644 arch/powerpc/boot/cuboot-yosemite.c create mode 100644 arch/powerpc/boot/dts/canyonlands.dts create mode 100644 arch/powerpc/boot/dts/yosemite.dts create mode 100644 arch/powerpc/configs/canyonlands_defconfig create mode 100644 arch/powerpc/platforms/44x/canyonlands.c WARNING: Merge successful but resolve requested ## # check ## Differences exist, continuing ## # label ## Created commit 44aba81: 2.6.25-rc4-mc8 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- ##