Switched to branch "2.6.25-rc1-mc6" Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc1-mc6" Already on branch "2.6.25-rc1-mc6" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc1-mc6" Already on branch "2.6.25-rc1-mc6" Switched to branch "gregkh-usb" Switched to branch "2.6.25-rc1-mc6" Already on branch "2.6.25-rc1-mc6" remote: Counting objects: 1  remote: Counting objects: 11, done. remote: Compressing objects: 16% (1/6)  remote: Compressing objects: 33% (2/6)  remote: Compressing objects: 50% (3/6)  remote: Compressing objects: 66% (4/6)  remote: Compressing objects: 83% (5/6)  remote: Compressing objects: 100% (6/6)  remote: Compressing objects: 100% (6/6), done. remote: Total 6 (delta 5), reused 0 (delta 0) From /pub/scm/linux/kernel/git/perex/alsa 8ef3c24..01e1fa3 linus -> alsa remote: Counting objects: 488, done. remote: Compressing objects: 0% (1/135)  remote: Compressing objects: 1% (2/135)  remote: Compressing objects: 2% (3/135)  remote: Compressing objects: 3% (5/135)  remote: Compressing objects: 4% (6/135)  remote: Compressing objects: 5% (7/135)  remote: Compressing objects: 6% (9/135)  remote: Compressing objects: 7% (10/135)  remote: Compressing objects: 8% (11/135)  remote: Compressing objects: 9% (13/135)  remote: Compressing objects: 10% (14/135)  remote: Compressing objects: 11% (15/135)  remote: Compressing objects: 12% (17/135)  remote: Compressing objects: 13% (18/135)  remote: Compressing objects: 14% (19/135)  remote: Compressing objects: 15% (21/135)  remote: Compressing objects: 16% (22/135)  remote: Compressing objects: 17% (23/135)  remote: Compressing objects: 18% (25/135)  remote: Compressing objects: 19% (26/135)  remote: Compressing objects: 20% (27/135)  remote: Compressing objects: 21% (29/135)  remote: Compressing objects: 22% (30/135)  remote: Compressing objects: 23% (32/135)  remote: Compressing objects: 24% (33/135)  remote: Compressing objects: 25% (34/135)  remote: Compressing objects: 26% (36/135)  remote: Compressing objects: 27% (37/135)  remote: Compressing objects: 28% (38/135)  remote: Compressing objects: 29% (40/135)  remote: Compressing objects: 30% (41/135)  remote: Compressing objects: 31% (42/135)  remote: Compressing objects: 32% (44/135)  remote: Compressing objects: 33% (45/135)  remote: Compressing objects: 34% (46/135)  remote: Compressing objects: 35% (48/135)  remote: Compressing objects: 36% (49/135)  remote: Compressing objects: 37% (50/135)  remote: Compressing objects: 38% (52/135)  remote: Compressing objects: 39% (53/135)  remote: Compressing objects: 40% (54/135)  remote: Compressing objects: 41% (56/135)  remote: Compressing objects: 42% (57/135)  remote: Compressing objects: 43% (59/135)  remote: Compressing objects: 44% (60/135)  remote: Compressing objects: 45% (61/135)  remote: Compressing objects: 46% (63/135)  remote: Compressing objects: 47% (64/135)  remote: Compressing objects: 48% (65/135)  remote: Compressing objects: 49% (67/135)  remote: Compressing objects: 50% (68/135)  remote: Compressing objects: 51% (69/135)  remote: Compressing objects: 52% (71/135)  remote: Compressing objects: 53% (72/135)  remote: Compressing objects: 54% (73/135)  remote: Compressing objects: 55% (75/135)  remote: Compressing objects: 56% (76/135)  remote: Compressing objects: 57% (77/135)  remote: Compressing objects: 58% (79/135)  remote: Compressing objects: 59% (80/135)  remote: Compressing objects: 60% (81/135)  remote: Compressing objects: 61% (83/135)  remote: Compressing objects: 62% (84/135)  remote: Compressing objects: 63% (86/135)  remote: Compressing objects: 64% (87/135)  remote: Compressing objects: 65% (88/135)  remote: Compressing objects: 66% (90/135)  remote: Compressing objects: 67% (91/135)  remote: Compressing objects: 68% (92/135)  remote: Compressing objects: 69% (94/135)  remote: Compressing objects: 70% (95/135)  remote: Compressing objects: 71% (96/135)  remote: Compressing objects: 72% (98/135)  remote: Compressing objects: 73% (99/135)  remote: Compressing objects: 74% (100/135)  remote: Compressing objects: 75% (102/135)  remote: Compressing objects: 76% (103/135)  remote: Compressing objects: 77% (104/135)  remote: Compressing objects: 78% (106/135)  remote: Compressing objects: 79% (107/135)  remote: Compressing objects: 80% (108/135)  remote: Compressing objects: 81% (110/135)  remote: Compressing objects: 82% (111/135)  remote: Compressing objects: 83% (113/135)  remote: Compressing objects: 84% (114/135)  remote: Compressing objects: 85% (115/135)  remote: Compressing objects: 86% (117/135)  remote: Compressing objects: 87% (118/135)  remote: Compressing objects: 88% (119/135)  remote: Compressing objects: 89% (121/135)  remote: Compressing objects: 90% (122/135)  remote: Compressing objects: 91% (123/135)  remote: Compressing objects: 92% (125/135)  remote: Compressing objects: 93% (126/135)  remote: Compressing objects: 94% (127/135)  remote: Compressing objects: 95% (129/135)  remote: Compressing objects: 96% (130/135)  remote: Compressing objects: 97% (131/135)  remote: Compressing objects: 98% (133/135)  remote: Compressing objects: 99% (134/135)  remote: Compressing objects: 100% (135/135)  remote: Compressing objects: 100% (135/135), done. remote: Total 414 (delta 364), reused 281 (delta 279) Receiving objects: 0% (1/414) Receiving objects: 1% (5/414) Receiving objects: 2% (9/414) Receiving objects: 3% (13/414) Receiving objects: 4% (17/414) Receiving objects: 4% (18/414) Receiving objects: 5% (21/414) Receiving objects: 6% (25/414), 12.01 KiB | 7 KiB/s Receiving objects: 7% (29/414), 12.01 KiB | 7 KiB/s Receiving objects: 8% (34/414), 12.01 KiB | 7 KiB/s Receiving objects: 9% (38/414), 12.01 KiB | 7 KiB/s Receiving objects: 10% (42/414), 12.01 KiB | 7 KiB/s Receiving objects: 11% (46/414), 12.01 KiB | 7 KiB/s Receiving objects: 12% (50/414), 12.01 KiB | 7 KiB/s Receiving objects: 13% (54/414), 12.01 KiB | 7 KiB/s Receiving objects: 14% (58/414), 12.01 KiB | 7 KiB/s Receiving objects: 15% (63/414), 12.01 KiB | 7 KiB/s Receiving objects: 16% (67/414), 12.01 KiB | 7 KiB/s Receiving objects: 17% (71/414), 12.01 KiB | 7 KiB/s Receiving objects: 18% (75/414), 12.01 KiB | 7 KiB/s Receiving objects: 19% (79/414), 12.01 KiB | 7 KiB/s Receiving objects: 20% (83/414), 12.01 KiB | 7 KiB/s Receiving objects: 21% (87/414), 12.01 KiB | 7 KiB/s Receiving objects: 22% (92/414), 12.01 KiB | 7 KiB/s Receiving objects: 23% (96/414), 12.01 KiB | 7 KiB/s Receiving objects: 24% (100/414), 12.01 KiB | 7 KiB/s Receiving objects: 25% (104/414), 12.01 KiB | 7 KiB/s Receiving objects: 26% (108/414), 12.01 KiB | 7 KiB/s Receiving objects: 27% (112/414), 12.01 KiB | 7 KiB/s Receiving objects: 28% (116/414), 12.01 KiB | 7 KiB/s Receiving objects: 29% (121/414), 12.01 KiB | 7 KiB/s Receiving objects: 30% (125/414), 12.01 KiB | 7 KiB/s Receiving objects:Merge made by recursive. Documentation/video4linux/CARDLIST.em28xx | 2 +- Documentation/video4linux/CARDLIST.saa7134 | 6 +- Documentation/video4linux/zr364xx.txt | 4 +- drivers/media/Kconfig | 16 +- drivers/media/common/Kconfig | 2 +- drivers/media/common/ir-keymaps.c | 46 ++ drivers/media/common/saa7146_vbi.c | 1 - drivers/media/common/saa7146_video.c | 2 - drivers/media/dvb/bt8xx/bt878.c | 23 +- drivers/media/dvb/dvb-usb/ttusb2.c | 1 + drivers/media/dvb/frontends/tda10086.c | 28 +- drivers/media/dvb/frontends/tda10086.h | 3 + drivers/media/dvb/frontends/tda18271-common.c | 2 +- drivers/media/dvb/ttpci/av7110_av.c | 15 +- drivers/media/dvb/ttpci/budget-av.c | 8 + drivers/media/dvb/ttpci/budget.c | 1 + drivers/media/radio/Kconfig | 4 +- drivers/media/radio/radio-sf16fmi.c | 1 + drivers/media/radio/radio-sf16fmr2.c | 5 +- drivers/media/radio/radio-si470x.c | 597 +++++++++++++++---------- drivers/media/video/Kconfig | 4 +- drivers/media/video/Makefile | 5 +- drivers/media/video/bt8xx/bttv-driver.c | 50 +-- drivers/media/video/bt8xx/bttv-vbi.c | 4 +- drivers/media/video/cx88/cx88-mpeg.c | 16 +- drivers/media/video/cx88/cx88.h | 1 + drivers/media/video/em28xx/em28xx-audio.c | 6 +- drivers/media/video/em28xx/em28xx-cards.c | 8 +- drivers/media/video/em28xx/em28xx-core.c | 111 +++-- drivers/media/video/em28xx/em28xx-video.c | 79 +++- drivers/media/video/em28xx/em28xx.h | 5 +- drivers/media/video/saa7134/saa7134-cards.c | 123 +++++- drivers/media/video/saa7134/saa7134-dvb.c | 28 +- drivers/media/video/saa7134/saa7134-empress.c | 6 +- drivers/media/video/saa7134/saa7134-input.c | 6 + drivers/media/video/saa7134/saa7134-video.c | 20 +- drivers/media/video/saa7134/saa7134.h | 2 + drivers/media/video/stk-sensor.c | 23 +- drivers/media/video/stk-webcam.c | 104 ++++- drivers/media/video/stk-webcam.h | 3 +- drivers/media/video/tcm825x.c | 2 +- drivers/media/video/tuner-core.c | 2 +- drivers/media/video/tvaudio.c | 10 +- drivers/media/video/tveeprom.c | 2 +- drivers/media/video/v4l2-common.c | 393 ++--------------- drivers/media/video/videobuf-core.c | 78 ++-- drivers/media/video/videobuf-dma-sg.c | 4 +- drivers/media/video/videobuf-vmalloc.c | 20 +- drivers/media/video/videodev.c | 444 ++++++++++++++++--- drivers/media/video/zr364xx.c | 2 + include/media/ir-common.h | 1 + include/media/v4l2-common.h | 2 - include/media/v4l2-dev.h | 2 + include/media/videobuf-core.h | 2 +- include/media/videobuf-vmalloc.h | 2 +- 55 files changed, 1430 insertions(+), 907 deletions(-) ## # quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## i2c-pxa-misc-fixes.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.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/i2c-pca-isa.c | 53 ++++++---------- drivers/i2c/busses/i2c-pxa.c | 27 +++++---- include/linux/i2c-algo-pca.h | 37 ++++++++++-- 6 files changed, 134 insertions(+), 173 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h ## # git /pub/scm/linux/kernel/git/jikos/hid.git upstream hid-upstream ## BRANCH upstream not in tree /pub/scm/linux/kernel/git/jikos/hid.git, SKIPPING ## # 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 ## Merge made by recursive. arch/x86/Kconfig | 4 +- arch/x86/kvm/kvm_svm.h | 2 + arch/x86/kvm/mmu.c | 190 ++++++++++++++++++++++++++++-------- arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 35 ++++--- arch/x86/kvm/svm.c | 233 +++++++++++++++++++++++++++++++++++--------- arch/x86/kvm/vmx.c | 114 +++++++++++++++++----- arch/x86/kvm/vmx.h | 10 ++- arch/x86/kvm/x86.c | 142 ++++++++++++++++----------- arch/x86/kvm/x86_emulate.c | 143 +++++++++++++++------------ include/asm-x86/kvm_host.h | 9 ++- include/linux/kvm.h | 4 +- include/linux/kvm_host.h | 3 + virt/kvm/kvm_main.c | 18 +++- 14 files changed, 653 insertions(+), 260 deletions(-) ## # 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 ## Already up-to-date. ## # quilt /pub/linux/kernel/people/bart/pata-2.6/patches/. ide ## building file list ... done ./ ide-acpi-add-missing-drive-acpidata-zeroing.patch ide-add-generic-packet-command-representation-ide_atapi_pc.patch ide-add-ide_atapi_discard_data-write_zeros-inline-helpers.patch ide-add-ide_generic-class-and-attribute-for-adding-new-interfaces.patch ide-add-missing-base-addresses-for-falconide-and-macide.patch ide-add-warm-plug-support-for-ide-devices.patch ide-factor-out-cable-detection-from-ide_init_port.patch ide-factor-out-devices-init-from-ide_init_port_data.patch ide-factor-out-unregistering-devices-from-ide_unregister.patch ide-fix-ide_find_port.patch ide-floppy-convert-driver-to-using-generic-ide_atapi_pc.patch ide-floppy-remove-struct-idefloppy_id_gcw.patch ide-floppy-rename-end_request-handler-properly.patch ide-generic-set-hwif-chipset.patch ide-move-ide_port_setup_devices-call-to-ide_device_add_all.patch ide-remove-broken-dangerous-ide-unregister-scan-hwif-ioctls-take-2.patch ide-remove-config_blk_dev_hd_ide-config-option.patch ide-remove-hold-field-from-ide_hwif_t-take-2.patch ide-remove-ide_-_reg-macros.patch ide-remove-ide_init_hwif_ports.patch ide-remove-init_hwif_default.patch ide-remove-needless-config_blk_dev_hd-hack-from-init_hwif.patch ide-remove-obsoleted-idex-base_-ctl_-irq_-kernel-parameters.patch ide-rework-powermac-media-bay-support.patch ide-scsi-convert-driver-to-using-generic-ide_atapi_pc.patch ide-scsi-do-non-atomic-pc-flags-testing.patch ide-tape-convert-driver-to-using-generic-ide_atapi_pc.patch ide-tape-move-all-struct-and-other-defs-at-the-top.patch ide-tape-remove-atomic-test_set-macros-for-packet-commands.patch ide-tape-schedule-driver-for-removal-after-6-months.patch ide-use-generic-atapi-packet-command-flags-in-ide-floppy-tape.patch ide-use-ide_find_port-instead-of-ide_deprecated_find_port.patch series sent 220319 bytes received 752 bytes 442142.00 bytes/sec total size is 216241 speedup is 0.98 ide-add-missing-base-addresses-for-falconide-and-macide.patch ide-tape-schedule-driver-for-removal-after-6-months.patch ide-generic-set-hwif-chipset.patch ide-fix-ide_find_port.patch ide-use-ide_find_port-instead-of-ide_deprecated_find_port.patch ide-acpi-add-missing-drive-acpidata-zeroing.patch ide-factor-out-cable-detection-from-ide_init_port.patch ide-factor-out-unregistering-devices-from-ide_unregister.patch ide-factor-out-devices-init-from-ide_init_port_data.patch ide-move-ide_port_setup_devices-call-to-ide_device_add_all.patch ide-rework-powermac-media-bay-support.patch ide-add-warm-plug-support-for-ide-devices.patch ide-add-ide_generic-class-and-attribute-for-adding-new-interfaces.patch ide-remove-needless-config_blk_dev_hd-hack-from-init_hwif.patch ide-remove-config_blk_dev_hd_ide-config-option.patch ide-remove-obsoleted-idex-base_-ctl_-irq_-kernel-parameters.patch ide-remove-broken-dangerous-ide-unregister-scan-hwif-ioctls-take-2.patch ide-remove-hold-field-from-ide_hwif_t-take-2.patch ide-remove-init_hwif_default.patch ide-remove-ide_init_hwif_ports.patch ide-floppy-remove-struct-idefloppy_id_gcw.patch ide-add-ide_atapi_discard_data-write_zeros-inline-helpers.patch ide-remove-ide_-_reg-macros.patch ide-tape-move-all-struct-and-other-defs-at-the-top.patch ide-tape-remove-atomic-test_set-macros-for-packet-commands.patch ide-add-generic-packet-command-representation-ide_atapi_pc.patch ide-tape-convert-driver-to-using-generic-ide_atapi_pc.patch ide-floppy-convert-driver-to-using-generic-ide_atapi_pc.patch ide-scsi-convert-driver-to-using-generic-ide_atapi_pc.patch ide-floppy-rename-end_request-handler-properly.patch ide-use-generic-atapi-packet-command-flags-in-ide-floppy-tape.patch ide-scsi-do-non-atomic-pc-flags-testing.patch ## # merge ide ## Merge made by recursive. Documentation/feature-removal-schedule.txt | 14 +- Documentation/ide.txt | 31 -- Documentation/ide/warm-plug-howto.txt | 13 + block/compat_ioctl.c | 1 - drivers/ide/Kconfig | 25 +- drivers/ide/Makefile | 2 +- drivers/ide/arm/bast-ide.c | 6 +- drivers/ide/arm/palm_bk3710.c | 4 +- drivers/ide/arm/rapide.c | 2 +- drivers/ide/cris/ide-cris.c | 18 +- drivers/ide/ide-acpi.c | 2 + drivers/ide/ide-cd.c | 10 +- drivers/ide/ide-floppy.c | 346 +++++++----------- drivers/ide/ide-generic.c | 81 ++++- drivers/ide/ide-io.c | 38 ++- drivers/ide/ide-iops.c | 86 +++-- drivers/ide/ide-pnp.c | 2 +- drivers/ide/ide-probe.c | 127 ++++++-- drivers/ide/ide-proc.c | 3 - drivers/ide/ide-tape.c | 541 +++++++++++++--------------- drivers/ide/ide-taskfile.c | 29 +- drivers/ide/ide.c | 372 +++++-------------- drivers/ide/legacy/falconide.c | 2 +- drivers/ide/legacy/ht6560b.c | 13 +- drivers/ide/legacy/ide-cs.c | 8 +- drivers/ide/legacy/ide_platform.c | 2 +- drivers/ide/legacy/macide.c | 2 +- drivers/ide/mips/au1xxx-ide.c | 5 +- drivers/ide/pci/cmd640.c | 2 +- drivers/ide/pci/delkin_cb.c | 8 +- drivers/ide/pci/hpt366.c | 2 +- drivers/ide/pci/scc_pata.c | 8 +- drivers/ide/pci/sgiioc4.c | 19 +- drivers/ide/ppc/pmac.c | 7 +- drivers/ide/setup-pci.c | 11 - drivers/macintosh/mediabay.c | 17 +- drivers/scsi/ide-scsi.c | 203 +++++------ include/asm-powerpc/mediabay.h | 4 +- include/linux/hdreg.h | 4 +- include/linux/ide.h | 164 ++++++---- 40 files changed, 1068 insertions(+), 1166 deletions(-) create mode 100644 Documentation/ide/warm-plug-howto.txt ## # 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-for-2.6.25 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release acpi ## Merge made by recursive. Documentation/00-INDEX | 2 + Documentation/cpuidle/core.txt | 23 ++++++++++ Documentation/cpuidle/driver.txt | 31 ++++++++++++++ Documentation/cpuidle/governor.txt | 29 +++++++++++++ Documentation/cpuidle/sysfs.txt | 79 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/acpi/cstate.c | 2 + drivers/acpi/blacklist.c | 64 +++++++++++++++++++++++++---- drivers/acpi/event.c | 2 +- drivers/acpi/hardware/hwsleep.c | 1 + drivers/acpi/osl.c | 6 +- drivers/acpi/processor_idle.c | 19 +++++++++ drivers/cpuidle/cpuidle.c | 3 +- drivers/cpuidle/sysfs.c | 14 +++++- drivers/misc/thinkpad_acpi.c | 4 +- drivers/pnp/pnpacpi/core.c | 2 +- include/acpi/processor.h | 9 +++- include/linux/acpi.h | 1 + include/linux/cpuidle.h | 2 + 18 files changed, 271 insertions(+), 22 deletions(-) create mode 100644 Documentation/cpuidle/core.txt create mode 100644 Documentation/cpuidle/driver.txt create mode 100644 Documentation/cpuidle/governor.txt create mode 100644 Documentation/cpuidle/sysfs.txt ## # 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 ## Auto-merged drivers/ieee1394/sbp2.c Merge made by recursive. drivers/firewire/fw-sbp2.c | 75 ++++++++++++++++++++++++++++++------------- drivers/ieee1394/sbp2.c | 7 +--- 2 files changed, 54 insertions(+), 28 deletions(-) ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-for-linus iop ## Already up-to-date. ## # 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 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/davem/net-2.6.git master net ## Auto-merged include/linux/netdevice.h Auto-merged net/core/dev.c Auto-merged net/core/skbuff.c Merge made by recursive. drivers/bluetooth/hci_ldisc.c | 1 + drivers/net/8139too.c | 2 +- drivers/net/Kconfig | 18 + drivers/net/Makefile | 3 +- drivers/net/cxgb3/l2t.c | 2 +- drivers/net/cxgb3/sge.c | 35 +- drivers/net/dm9000.c | 654 ++++++--- drivers/net/e1000/e1000_main.c | 18 +- drivers/net/forcedeth.c | 132 ++- drivers/net/ni52.c | 1142 ++++++++-------- drivers/net/ni52.h | 158 +- drivers/net/pcnet32.c | 48 +- drivers/net/phy/fixed.c | 4 +- drivers/net/ps3_gelic_net.c | 1215 +++++++++------- drivers/net/ps3_gelic_net.h | 415 ++++-- drivers/net/ps3_gelic_wireless.c | 2753 ++++++++++++++++++++++++++++++++++++ drivers/net/ps3_gelic_wireless.h | 329 +++++ drivers/net/r6040.c | 233 ++-- drivers/net/sis190.c | 3 +- drivers/s390/net/claw.h | 19 +- drivers/s390/net/lcs.c | 2 +- drivers/s390/net/lcs.h | 16 +- drivers/s390/net/netiucv.c | 29 +- include/linux/dm9000.h | 2 + include/linux/netdevice.h | 8 +- include/net/ax25.h | 2 + include/net/ndisc.h | 1 - include/net/xfrm.h | 5 +- net/ax25/af_ax25.c | 12 +- net/ax25/ax25_dev.c | 2 +- net/ax25/ax25_ds_timer.c | 12 +- net/ax25/ax25_route.c | 28 +- net/ax25/ax25_timer.c | 60 +- net/core/dev.c | 4 +- net/core/neighbour.c | 12 +- net/core/rtnetlink.c | 36 +- net/core/skbuff.c | 3 +- net/ipv4/ah4.c | 2 +- net/ipv4/arp.c | 3 - net/ipv4/esp4.c | 5 +- net/ipv4/fib_trie.c | 99 ++- net/ipv4/ip_sockglue.c | 5 - net/ipv6/ah6.c | 2 +- net/ipv6/esp6.c | 5 +- net/ipv6/ip6_output.c | 6 +- net/ipv6/xfrm6_output.c | 2 +- net/netlabel/netlabel_domainhash.c | 6 +- net/netlabel/netlabel_unlabeled.c | 30 +- net/netlabel/netlabel_user.c | 3 +- net/netlink/genetlink.c | 6 +- net/xfrm/xfrm_input.c | 4 +- net/xfrm/xfrm_output.c | 2 +- 52 files changed, 5653 insertions(+), 1945 deletions(-) create mode 100644 drivers/net/ps3_gelic_wireless.c create mode 100644 drivers/net/ps3_gelic_wireless.h ## # git git://git.linux-nfs.org/pub/linux/nfs-2.6.git master nfs ## Already up-to-date. ## # git git://git390.osdl.marist.edu/pub/scmerror: branch 'ocfs2' not found. error: branch 'selinux' not found. Already on branch "2.6.25-rc1-mc6" remote: Counting objects: 266, done. remote: Compressing objects: 2% (1/49)  remote: Compressing objects: 4% (2/49)  remote: Compressing objects: 6% (3/49)  remote: Compressing objects: 8% (4/49)  remote: Compressing objects: 10% (5/49)  remote: Compressing objects: 12% (6/49)  remote: Compressing objects: 14% (7/49)  remote: Compressing objects: 16% (8/49)  remote: Compressing objects: 18% (9/49)  remote: Compressing objects: 20% (10/49)  remote: Compressing objects: 22% (11/49)  remote: Compressing objects: 24% (12/49)  remote: Compressing objects: 26% (13/49)  remote: Compressing objects: 28% (14/49)  remote: Compressing objects: 30% (15/49)  remote: Compressing objects: 32% (16/49)  remote: Compressing objects: 34% (17/49)  remote: Compressing objects: 36% (18/49)  remote: Compressing objects: 38% (19/49)  remote: Compressing objects: 40% (20/49)  remote: Compressing objects: 42% (21/49)  remote: Compressing objects: 44% (22/49)  remote: Compressing objects: 46% (23/49)  remote: Compressing objects: 48% (24/49)  remote: Compressing objects: 51% (25/49)  remote: Compressing objects: 53% (26/49)  remote: Compressing objects: 55% (27/49)  remote: Compressing objects: 57% (28/49)  remote: Compressing objects: 59% (29/49)  remote: Compressing objects: 61% (30/49)  remote: Compressing objects: 63% (31/49)  remote: Compressing objects: 65% (32/49)  remote: Compressing objects: 67% (33/49)  remote: Compressing objects: 69% (34/49)  remote: Compressing objects: 71% (35/49)  remote: Compressing objects: 73% (36/49)  remote: Compressing objects: 75% (37/49)  remote: Compressing objects: 77% (38/49)  remote: Compressing objects: 79% (39/49)  remote: Compressing objects: 81% (40/49)  remote: Compressing objects: 83% (41/49)  remote: Compressing objects: 85% (42/49)  remote: Compressing objects: 87% (43/49)  remote: Compressing objects: 89% (44/49)  remote: Compressing objects: 91% (45/49)  remote: Compressing objects: 93% (46/49)  remote: Compressing objects: 95% (47/49)  remote: Compressing objects: 97% (48/49)  remote: Compressing objects: 100% (49/49)  remote: Compressing objects: 100% (49/49), done. remote: Total 220 (delta 169), reused 220 (delta 169) Receiving objects: 0% (1/220) Receiving objects: 1% (3/220) Receiving objects: 2% (5/220) Receiving objects: 3% (7/220) Receiving objects: 4% (9/220) Receiving objects: 5% (11/220) Receiving objects: 6% (14/220) Receiving objects: 7% (16/220) Receiving objects: 8% (18/220) Receiving objects: 9% (20/220) Receiving objects: 10% (22/220) Receiving objects: 11% (25/220) Receiving objects: 12% (27/220) Receiving objects: 13% (29/220) Receiving objects: 14% (31/220) Receiving objects: 15% (33/220) Receiving objects: 16% (36/220) Receiving objects: 17% (38/220) Receiving objects: 18% (40/220) Receiving objects: 19% (42/220) Receiving objects: 20% (44/220) Receiving objects: 21% (47/220) Receiving objects: 22% (49/220) Receiving objects: 23% (51/220) Receiving objects: 24% (53/220) Receiving objects: 25% (55/220) Receiving objects: 26% (58/220) Receiving objects: 27% (60/220) Receiving objects: 28% (62/220) Receiving objects: 29% (64/220) Receiving objects: 30% (66/220) Receiving objects: 31% (69/220) Receiving objects: 32% (71/220) Receiving objects: 33% (73/220) Receiving objects: 34% (75/220) Receiving objects: 35% (77/220) Receiving objects: 36% (80/220) Receiving objects: 37% (82/220) Receiving objects: 38% (84/220) Receiving objects: 39% (86/220) Receiving objects: 40% (88/220) Receiving objects: 41% (91/220) Receiving objects: 42% (93/220) Receiving objects: 43% (95/220) Receiving objects: 44% (97/220) Receiving objects: 45% (99/220) Receiving objects: 46% (102/220) Receiving objects: 47% (104/220) Receiving objects: 48% (106/220) Receiving objects: 49% (108/220) Receiving objects: 50% (110/220) Receiving objects: 51% (113/220) Receiving objects: 52% (115/220) Receiving objects: 53% (117/220) Receiving objects: 54% (119/220) Receiving objects: 55% (121/220) Receiving objects: 56% (124/220) Receiving objects: 57% (126/220) Receiving objects: 58% (128/220) Receiving objects: 59% (130/220) Receiving objects: 60% (132/220) Receiving objects: 61% (135/220) Receiving objects: 62% (137/220) Receiving objects: 63% (139/220) Receiving objects: 64% (141/220) Receiving objects: 65% (143/220) Receiving objects: 66% (146/220) Receiving objects: 67% (148/220) Receiving objects: 68% (150/220) Receiving objects: 69% (152/220) Receiving objects: 70% (154/220) Receiving objects: 71% (157/220) Receiving objects: 72% (159/220) Receiving objects: 73% (161/220) Receiving objects: 74% (163/220) Receiving objects: 75% (165/220) Receiving objects: 76% (168/220) Receiving objects: 77% (170/220) Receiving objects: 78% (172/220) Receiving objects: 79% (174/220) Receiving objects: 80% (176/220) Receiving objects: 81% (179/220) Receiving objects: 82% (181/220) Receiving objects: 83% (183/220) Receiving objects: 84% (185/220) Receiving objects: 85% (187/220) Receiving objects: 86% (190/220) Receiving objects: 87% (192/220) Receiving objects: 88% (194/220) Receiving objects: 89% (196/220) Receiving objects: 90% (198/220) Receiving objects: 91% (201/220) Receiving objects: 92% (203/220) Receiving objects: 93% (205/220) Receiving objects: 94% (207/220) Receiving objects: 95% (209/220) Receiving objects: 96% (212/220) Receiving objects: 97% (214/220) Receiving objects: 98% (216/220) Receiving objects: 99% (218/220) Receiving objects: 100% (220/220) Receiving objects: 100% (220/220), 42.90 KiB, done. Resolving deltas: 11% (19/169) Resolving deltas: 13% (22/169) Resolving deltas: 14Merge made by recursive. arch/xtensa/Kconfig | 34 ++- arch/xtensa/Makefile | 45 ++- arch/xtensa/boot/boot-elf/Makefile | 9 +- arch/xtensa/boot/boot-elf/{boot.ld => boot.lds.S} | 4 +- arch/xtensa/boot/boot-redboot/Makefile | 2 +- arch/xtensa/boot/boot-redboot/boot.ld | 2 +- arch/xtensa/kernel/asm-offsets.c | 17 +- arch/xtensa/kernel/coprocessor.S | 443 +++++++++++++------- arch/xtensa/kernel/entry.S | 355 ++++------------ arch/xtensa/kernel/module.c | 2 +- arch/xtensa/kernel/process.c | 306 +++++--------- arch/xtensa/kernel/ptrace.c | 351 +++++++++------- arch/xtensa/kernel/setup.c | 5 - arch/xtensa/kernel/signal.c | 89 +++-- arch/xtensa/kernel/traps.c | 20 +- arch/xtensa/kernel/vmlinux.lds.S | 6 +- arch/xtensa/mm/cache.c | 7 +- arch/xtensa/mm/init.c | 2 +- arch/xtensa/mm/misc.S | 2 +- .../{platform-iss => platforms/issremote: Counting objects: 43, 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 29 (delta 25), reused 15 (delta 11) From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 fac8493..0f4f89d master -> x86 clude/asm-xtensa/timex.h | 8 +- include/asm-xtensa/uaccess.h | 99 +++--- include/asm-xtensa/variant-fsf/tie-asm.h | 70 +++ include/asm-xtensa/variant-fsf/tie.h | 75 +++- 41 files changed, 1262 insertions(+), 1200 deletions(-) rename arch/xtensa/boot/boot-elf/{boot.ld => boot.lds.S} (89%) rename arch/xtensa/{platform-iss => platforms/iss}/Makefile (100%) rename arch/xtensa/{platform-iss => platforms/iss}/console.c (98%) rename arch/xtensa/{platform-iss => platforms/iss}/io.c (100%) rename arch/xtensa/{platform-iss => platforms/iss}/network.c (99%) rename arch/xtensa/{platform-iss => platforms/iss}/setup.c (100%) create mode 100644 include/asm-xtensa/variant-fsf/tie-asm.h ## # git /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## Auto-merged arch/x86/kernel/traps_64.c Merge made by recursive. arch/x86/kernel/efi.c | 4 ++-- arch/x86/kernel/pci-gart_64.c | 9 +++++++++ arch/x86/kernel/traps_64.c | 4 ++-- arch/x86/mm/fault.c | 2 +- include/asm-x86/kdebug.h | 1 - mm/memory.c | 7 +++++++ 6 files changed, 21 insertions(+), 6 deletions(-) ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git release ia64-release ## Already up-to-date. ## # skip quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ doc ## SKIPPING: skip quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ doc ## # skip merge doc ## SKIPPING: skip merge doc ## # check ## Differences exist, continuing ## # label ## Created commit a0f625e: 2.6.25-rc1-mc6 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- ##