| $ git checkout master |
| Already on branch "master" |
| $ git reset --hard stable |
| HEAD is now at 7180c4c... Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 |
| Merging origin/master |
| $ git merge origin/master |
| Updating 7180c4c..783e391 |
| Fast forward |
| Documentation/spi/spi-summary | 15 ++- |
| arch/frv/kernel/entry-table.S | 8 +- |
| arch/frv/kernel/entry.S | 20 +++ |
| arch/frv/kernel/head.inc | 2 +- |
| arch/frv/kernel/switch_to.S | 7 - |
| arch/frv/kernel/traps.c | 227 +++++++++++++++++++++++++++++++++++ |
| arch/x86/kernel/alternative.c | 12 ++- |
| arch/x86/kernel/process_32.c | 47 ++------ |
| arch/x86/kernel/process_64.c | 47 ++------ |
| block/cfq-iosched.c | 9 +- |
| drivers/acpi/processor_core.c | 2 +- |
| drivers/acpi/thermal.c | 2 +- |
| drivers/ata/pata_sil680.c | 2 +- |
| drivers/ata/sata_fsl.c | 3 - |
| drivers/block/ub.c | 38 +++++-- |
| drivers/mtd/chips/cfi_cmdset_0002.c | 1 + |
| drivers/mtd/chips/cfi_cmdset_0020.c | 1 + |
| drivers/spi/spi_bfin5xx.c | 17 ++-- |
| fs/hfsplus/dir.c | 23 +++-- |
| fs/nfs/file.c | 4 + |
| fs/nfs/inode.c | 1 + |
| fs/splice.c | 31 +---- |
| fs/xfs/linux-2.6/xfs_ioctl.c | 2 +- |
| fs/xfs/quota/xfs_qm.c | 6 +- |
| fs/xfs/quota/xfs_qm_bhv.c | 2 +- |
| fs/xfs/quota/xfs_qm_syscalls.c | 4 +- |
| fs/xfs/xfs_attr_leaf.c | 6 +- |
| fs/xfs/xfs_bmap.c | 18 ++-- |
| 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_inode.c | 6 +- |
| fs/xfs/xfs_inode_item.c | 4 +- |
| fs/xfs/xfs_itable.c | 2 +- |
| fs/xfs/xfs_log.c | 14 +- |
| fs/xfs/xfs_log_priv.h | 4 +- |
| fs/xfs/xfs_log_recover.c | 16 ++-- |
| fs/xfs/xfs_mount.c | 59 +++++++-- |
| fs/xfs/xfs_sb.h | 107 ++++++----------- |
| fs/xfs/xfs_utils.c | 6 +- |
| fs/xfs/xfs_vfsops.c | 9 +- |
| fs/xfs/xfs_vnodeops.c | 2 +- |
| include/asm-frv/mem-layout.h | 2 +- |
| include/asm-frv/pgtable.h | 19 ++- |
| include/asm-frv/spr-regs.h | 14 ++ |
| include/asm-frv/system.h | 21 +++- |
| lib/lzo/lzo1x_decompress.c | 2 +- |
| mm/memcontrol.c | 9 +- |
| net/sunrpc/clnt.c | 4 - |
| net/sunrpc/xdr.c | 9 +- |
| security/selinux/hooks.c | 8 +- |
| sound/pci/es1968.c | 14 ++- |
| 53 files changed, 598 insertions(+), 324 deletions(-) |
| Merging x86-fixes/for-linus |
| $ git merge x86-fixes/for-linus |
| Merge made by recursive. |
| arch/x86/kernel/head64.c | 13 +++++++++++++ |
| arch/x86/kernel/head_64.S | 4 ++-- |
| arch/x86/kernel/vmlinux_64.lds.S | 6 ++++++ |
| arch/x86/mm/fault.c | 4 ---- |
| include/asm-x86/page_64.h | 4 ++-- |
| include/asm-x86/pgtable_64.h | 2 +- |
| 6 files changed, 24 insertions(+), 9 deletions(-) |
| Merging sched-fixes/for-linus |
| $ git merge sched-fixes/for-linus |
| Merge made by recursive. |
| kernel/sched.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- |
| 1 files changed, 49 insertions(+), 3 deletions(-) |
| Merging powerpc-merge/merge |
| $ git merge powerpc-merge/merge |
| Already up-to-date. |
| Merging scsi-rc-fixes/master |
| $ git merge scsi-rc-fixes/master |
| Already up-to-date. |
| Merging quilt/driver-core |
| $ git merge quilt/driver-core |
| Merge made by recursive. |
| Documentation/ABI/testing/sysfs-ibft | 23 + |
| Documentation/DocBook/kernel-api.tmpl | 5 - |
| Documentation/power/devices.txt | 5 + |
| MAINTAINERS | 5 + |
| arch/arm/Kconfig | 2 + |
| arch/x86/kernel/setup_32.c | 3 + |
| arch/x86/kernel/setup_64.c | 4 + |
| arch/x86/kernel/traps_32.c | 1 + |
| arch/x86/kernel/traps_64.c | 1 + |
| block/bsg.c | 11 +- |
| drivers/ata/ahci.c | 4 +- |
| drivers/ata/libata-scsi.c | 15 +- |
| drivers/base/attribute_container.c | 77 +- |
| drivers/base/bus.c | 17 +- |
| drivers/base/class.c | 8 +- |
| drivers/base/core.c | 30 +- |
| drivers/base/cpu.c | 4 +- |
| drivers/base/dd.c | 14 +- |
| drivers/base/firmware_class.c | 18 +- |
| drivers/base/memory.c | 33 +- |
| drivers/base/power/main.c | 66 +- |
| drivers/base/power/power.h | 23 +- |
| drivers/base/power/sysfs.c | 2 + |
| drivers/base/sys.c | 18 +- |
| drivers/base/transport_class.c | 14 +- |
| drivers/char/drm/drmP.h | 1 - |
| drivers/firmware/Kconfig | 20 + |
| drivers/firmware/Makefile | 2 + |
| drivers/firmware/iscsi_ibft.c | 982 ++++++++++++++++++++ |
| drivers/firmware/iscsi_ibft_find.c | 84 ++ |
| drivers/infiniband/core/sysfs.c | 76 +- |
| drivers/infiniband/core/ucm.c | 62 +- |
| drivers/infiniband/core/user_mad.c | 109 ++-- |
| drivers/infiniband/core/uverbs.h | 4 +- |
| drivers/infiniband/core/uverbs_main.c | 51 +- |
| drivers/infiniband/hw/amso1100/c2_provider.c | 48 +- |
| drivers/infiniband/hw/cxgb3/iwch_provider.c | 75 +- |
| drivers/infiniband/hw/ipath/ipath_diag.c | 10 +- |
| drivers/infiniband/hw/ipath/ipath_file_ops.c | 44 +- |
| drivers/infiniband/hw/ipath/ipath_kernel.h | 8 +- |
| drivers/infiniband/hw/ipath/ipath_verbs.c | 37 +- |
| drivers/infiniband/hw/mlx4/main.c | 49 +- |
| drivers/infiniband/hw/mthca/mthca_provider.c | 48 +- |
| drivers/infiniband/hw/nes/nes_verbs.c | 48 +- |
| drivers/infiniband/ulp/srp/ib_srp.c | 181 ++-- |
| drivers/infiniband/ulp/srp/ib_srp.h | 4 +- |
| drivers/memstick/core/memstick.c | 33 +- |
| drivers/memstick/core/mspro_block.c | 4 +- |
| drivers/memstick/host/jmb38x_ms.c | 16 +- |
| drivers/message/fusion/mptscsih.c | 122 ++-- |
| drivers/message/fusion/mptscsih.h | 2 +- |
| drivers/misc/enclosure.c | 118 ++-- |
| drivers/net/phy/phy_device.c | 8 +- |
| drivers/scsi/3w-9xxx.c | 9 +- |
| drivers/scsi/3w-xxxx.c | 9 +- |
| drivers/scsi/aacraid/aachba.c | 2 +- |
| drivers/scsi/aacraid/aacraid.h | 4 +- |
| drivers/scsi/aacraid/linit.c | 93 ++- |
| drivers/scsi/arcmsr/arcmsr.h | 4 +- |
| drivers/scsi/arcmsr/arcmsr_attr.c | 163 ++-- |
| drivers/scsi/ch.c | 13 +- |
| drivers/scsi/hosts.c | 34 +- |
| drivers/scsi/hptiop.c | 14 +- |
| drivers/scsi/ibmvscsi/ibmvscsi.c | 44 +- |
| drivers/scsi/ibmvscsi/ibmvstgt.c | 25 +- |
| drivers/scsi/ipr.c | 140 ++-- |
| drivers/scsi/lpfc/lpfc_attr.c | 484 +++++----- |
| drivers/scsi/lpfc/lpfc_crtn.h | 4 +- |
| drivers/scsi/megaraid/megaraid_mbox.c | 13 +- |
| drivers/scsi/ncr53c8xx.c | 7 +- |
| drivers/scsi/osst.c | 76 +- |
| drivers/scsi/pcmcia/sym53c500_cs.c | 14 +- |
| drivers/scsi/qla2xxx/qla_attr.c | 177 ++-- |
| drivers/scsi/qla2xxx/qla_gbl.h | 4 +- |
| drivers/scsi/raid_class.c | 73 +- |
| drivers/scsi/scsi_sas_internal.h | 24 +- |
| drivers/scsi/scsi_sysfs.c | 150 ++-- |
| drivers/scsi/scsi_transport_fc.c | 385 +++++---- |
| drivers/scsi/scsi_transport_iscsi.c | 107 ++- |
| drivers/scsi/scsi_transport_sas.c | 157 ++-- |
| drivers/scsi/scsi_transport_spi.c | 185 ++-- |
| drivers/scsi/scsi_transport_srp.c | 26 +- |
| drivers/scsi/sd.c | 78 +- |
| drivers/scsi/ses.c | 28 +- |
| drivers/scsi/sg.c | 36 +- |
| drivers/scsi/st.c | 71 +- |
| drivers/serial/serial_core.c | 2 +- |
| drivers/uio/Kconfig | 23 +- |
| drivers/uio/Makefile | 1 + |
| drivers/uio/uio_cif.c | 6 +- |
| drivers/uio/uio_smx.c | 140 +++ |
| fs/partitions/check.c | 4 + |
| fs/sysfs/dir.c | 1 + |
| fs/sysfs/file.c | 14 + |
| fs/sysfs/mount.c | 2 +- |
| fs/sysfs/sysfs.h | 1 + |
| include/linux/attribute_container.h | 28 +- |
| include/linux/bsg.h | 2 +- |
| include/linux/device.h | 21 +- |
| include/linux/enclosure.h | 11 +- |
| include/linux/init.h | 1 + |
| include/linux/iscsi_ibft.h | 50 + |
| include/linux/kernel.h | 6 +- |
| include/linux/libata.h | 2 +- |
| include/linux/memory.h | 5 +- |
| include/linux/memstick.h | 2 +- |
| include/linux/pm.h | 43 +- |
| include/linux/pm_wakeup.h | 90 ++ |
| include/linux/raid_class.h | 12 +- |
| include/linux/sysfs.h | 14 +- |
| include/linux/transport_class.h | 6 +- |
| include/rdma/ib_verbs.h | 2 +- |
| include/scsi/scsi_device.h | 10 +- |
| include/scsi/scsi_host.h | 7 +- |
| include/scsi/scsi_transport.h | 2 +- |
| include/scsi/scsi_transport_fc.h | 14 +- |
| include/scsi/scsi_transport_sas.h | 12 +- |
| include/scsi/sd.h | 4 +- |
| init/main.c | 9 + |
| lib/kobject.c | 71 ++- |
| mm/memory_hotplug.c | 2 +- |
| .../firmware_class/firmware_sample_driver.c | 49 +- |
| .../firmware_sample_firmware_class.c | 39 +- |
| scripts/mod/file2alias.c | 57 +- |
| 124 files changed, 3907 insertions(+), 2160 deletions(-) |
| create mode 100644 Documentation/ABI/testing/sysfs-ibft |
| create mode 100644 drivers/firmware/iscsi_ibft.c |
| create mode 100644 drivers/firmware/iscsi_ibft_find.c |
| create mode 100644 drivers/uio/uio_smx.c |
| create mode 100644 include/linux/iscsi_ibft.h |
| create mode 100644 include/linux/pm_wakeup.h |
| rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) |
| rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) |
| Merging quilt/pci |
| $ git merge quilt/pci |
| Merge made by recursive. |
| Documentation/00-INDEX | 10 - |
| Documentation/ABI/testing/sysfs-bus-pci | 11 + |
| Documentation/PCI/00-INDEX | 12 + |
| Documentation/{ => PCI}/PCIEBUS-HOWTO.txt | 12 +- |
| Documentation/{ => PCI}/pci-error-recovery.txt | 0 |
| Documentation/{ => PCI}/pci.txt | 2 +- |
| Documentation/{ => PCI}/pcieaer-howto.txt | 2 +- |
| Documentation/ide/ide.txt | 2 - |
| Documentation/kernel-parameters.txt | 10 +- |
| Documentation/memory-barriers.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/access.c | 166 +++++ |
| 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/intel-iommu.c | 147 ++++- |
| drivers/pci/iova.c | 50 +- |
| drivers/pci/iova.h | 2 + |
| drivers/pci/pci-sysfs.c | 114 +++- |
| drivers/pci/pci.c | 6 +- |
| drivers/pci/pci.h | 19 + |
| drivers/pci/pcie/Kconfig | 20 + |
| drivers/pci/pcie/Makefile | 3 + |
| drivers/pci/pcie/aer/aerdrv.c | 4 +- |
| drivers/pci/pcie/aer/aerdrv_acpi.c | 5 +- |
| 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 | 73 +-- |
| drivers/pci/quirks.c | 17 +- |
| drivers/pci/remove.c | 14 +- |
| drivers/pci/search.c | 313 ++++------ |
| drivers/pci/setup-bus.c | 3 + |
| drivers/pci/setup-res.c | 87 ++- |
| include/asm-sh/mpc1211/pci.h | 2 - |
| include/linux/aer.h | 5 - |
| include/linux/ide.h | 1 - |
| include/linux/ioport.h | 5 +- |
| include/linux/pci-aspm.h | 56 ++ |
| include/linux/pci.h | 30 +- |
| include/linux/pci_regs.h | 8 + |
| kernel/resource.c | 18 + |
| 106 files changed, 2217 insertions(+), 1619 deletions(-) |
| create mode 100644 Documentation/ABI/testing/sysfs-bus-pci |
| 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 (99%) |
| create mode 100644 drivers/pci/pcie/aspm.c |
| create mode 100644 include/linux/pci-aspm.h |
| Merging quilt/usb |
| $ git merge quilt/usb |
| Merge made by recursive. |
| Documentation/DocBook/writing_usb_driver.tmpl | 14 +- |
| Documentation/usb/WUSB-Design-overview.txt | 448 +++ |
| Documentation/usb/persist.txt | 43 +- |
| Documentation/usb/usb-serial.txt | 7 +- |
| Documentation/usb/wusb-cbaf | 136 + |
| 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 | 88 +- |
| drivers/usb/class/cdc-acm.h | 7 +- |
| drivers/usb/core/Kconfig | 42 +- |
| drivers/usb/core/config.c | 17 + |
| drivers/usb/core/devio.c | 46 +- |
| drivers/usb/core/driver.c | 51 +- |
| drivers/usb/core/hcd-pci.c | 5 - |
| drivers/usb/core/hcd.c | 2 - |
| drivers/usb/core/hcd.h | 2 +- |
| drivers/usb/core/hub.c | 469 ++- |
| drivers/usb/core/hub.h | 9 +- |
| 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 | 18 +- |
| drivers/usb/gadget/amd5536udc.c | 10 + |
| drivers/usb/gadget/at91_udc.c | 4 +- |
| drivers/usb/gadget/dummy_hcd.c | 28 +- |
| 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 | 92 +- |
| drivers/usb/gadget/pxa2xx_udc.c | 26 +- |
| drivers/usb/gadget/rndis.c | 146 +- |
| drivers/usb/gadget/serial.c | 3 +- |
| drivers/usb/host/Kconfig | 4 +- |
| 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 | 72 +- |
| 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 | 10 +- |
| 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 | 5139 ++++++++++++------------- |
| drivers/usb/host/uhci-hcd.c | 8 +- |
| drivers/usb/host/uhci-q.c | 2 +- |
| drivers/usb/image/Kconfig | 4 +- |
| drivers/usb/image/microtek.c | 1 - |
| drivers/usb/image/microtek.h | 1 - |
| drivers/usb/misc/Kconfig | 29 +- |
| 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/mon/Makefile | 2 +- |
| drivers/usb/mon/mon_bin.c | 9 +- |
| drivers/usb/mon/mon_main.c | 3 +- |
| drivers/usb/serial/Kconfig | 60 +- |
| 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 | 567 ++-- |
| 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 | 48 +- |
| 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 | 71 +- |
| drivers/usb/serial/oti6858.c | 114 +- |
| drivers/usb/serial/pl2303.c | 112 +- |
| drivers/usb/serial/safe_serial.c | 30 +- |
| drivers/usb/serial/sierra.c | 83 +- |
| drivers/usb/serial/spcp8x5.c | 1075 ++++++ |
| 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 | 39 +- |
| drivers/usb/storage/Makefile | 1 + |
| drivers/usb/storage/cypress_atacb.c | 200 + |
| drivers/usb/storage/cypress_atacb.h | 25 + |
| drivers/usb/storage/libusual.c | 14 +- |
| drivers/usb/storage/scsiglue.c | 26 +- |
| drivers/usb/storage/transport.c | 23 +- |
| drivers/usb/storage/unusual_devs.h | 8 + |
| drivers/usb/storage/usb.c | 26 +- |
| drivers/usb/usb-skeleton.c | 8 +- |
| include/linux/bitmap.h | 1 + |
| include/linux/usb.h | 188 +- |
| include/linux/usb/audio.h | 2 +- |
| include/linux/usb/cdc.h | 4 + |
| include/linux/usb/ch9.h | 17 +- |
| include/linux/usb/g_printer.h | 4 + |
| include/linux/usb/gadget.h | 2 +- |
| include/linux/usb/gadgetfs.h | 16 +- |
| include/linux/usb/input.h | 8 +- |
| include/linux/usb/iowarrior.h | 6 +- |
| include/linux/usb/isp116x.h | 6 +- |
| include/linux/usb/midi.h | 2 +- |
| include/linux/usb/net2280.h | 9 +- |
| include/linux/usb/otg.h | 6 +- |
| include/linux/usb/quirks.h | 5 + |
| include/linux/usb/rndis_host.h | 9 +- |
| include/linux/usb/serial.h | 3 +- |
| include/linux/usb/sl811.h | 5 +- |
| include/linux/usb/usbnet.h | 8 +- |
| include/linux/usb/wusb-wa.h | 284 ++ |
| include/linux/usb/wusb.h | 420 ++ |
| include/linux/usb_usual.h | 1 + |
| include/linux/uwb.h | 770 ++++ |
| include/linux/uwb/bugs-macros.h | 64 + |
| include/linux/uwb/bugs.h | 41 + |
| include/linux/uwb/debug-cmd.h | 57 + |
| include/linux/uwb/debug.h | 82 + |
| include/linux/uwb/spec.h | 650 ++++ |
| include/linux/uwb/umc.h | 194 + |
| include/linux/uwb/util.h | 87 + |
| include/linux/uwb/whci.h | 117 + |
| include/linux/wlp.h | 728 ++++ |
| lib/bitmap.c | 20 + |
| 177 files changed, 11814 insertions(+), 5825 deletions(-) |
| create mode 100644 Documentation/usb/WUSB-Design-overview.txt |
| create mode 100644 Documentation/usb/wusb-cbaf |
| create mode 100644 drivers/usb/misc/gotemp.c |
| create mode 100644 drivers/usb/serial/spcp8x5.c |
| create mode 100644 drivers/usb/storage/cypress_atacb.c |
| create mode 100644 drivers/usb/storage/cypress_atacb.h |
| create mode 100644 include/linux/usb/wusb-wa.h |
| create mode 100644 include/linux/usb/wusb.h |
| create mode 100644 include/linux/uwb.h |
| create mode 100644 include/linux/uwb/bugs-macros.h |
| create mode 100644 include/linux/uwb/bugs.h |
| create mode 100644 include/linux/uwb/debug-cmd.h |
| create mode 100644 include/linux/uwb/debug.h |
| create mode 100644 include/linux/uwb/spec.h |
| create mode 100644 include/linux/uwb/umc.h |
| create mode 100644 include/linux/uwb/util.h |
| create mode 100644 include/linux/uwb/whci.h |
| create mode 100644 include/linux/wlp.h |
| Merging x86/for-akpm |
| $ git merge x86/for-akpm |
| Auto-merged Documentation/kernel-parameters.txt |
| Auto-merged arch/x86/kernel/alternative.c |
| Removed arch/x86/kernel/mpparse_64.c |
| Auto-merged arch/x86/kernel/process_32.c |
| Auto-merged arch/x86/kernel/process_64.c |
| 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 |
| Removed arch/x86/kernel/smpboot_64.c |
| Auto-merged arch/x86/kernel/traps_32.c |
| Auto-merged arch/x86/kernel/traps_64.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/i386.c |
| Removed include/asm-x86/mach-default/mach_reboot.h |
| Removed include/asm-x86/mach_apic.h |
| Removed include/asm-x86/nmi_32.h |
| Removed include/asm-x86/nmi_64.h |
| Removed include/asm-x86/smp_32.h |
| Removed include/asm-x86/smp_64.h |
| Auto-merged init/main.c |
| Merge made by recursive. |
| Documentation/feature-removal-schedule.txt | 12 - |
| Documentation/i386/boot.txt | 28 + |
| Documentation/kernel-parameters.txt | 18 + |
| Documentation/x86/pat.txt | 100 ++ |
| Documentation/x86_64/boot-options.txt | 5 + |
| arch/x86/Kconfig | 95 ++- |
| arch/x86/Kconfig.cpu | 3 +- |
| arch/x86/Kconfig.debug | 62 ++- |
| arch/x86/Makefile | 9 +- |
| arch/x86/boot/Makefile | 14 + |
| arch/x86/boot/compressed/Makefile | 2 +- |
| arch/x86/boot/compressed/misc.c | 202 +++-- |
| arch/x86/boot/cpucheck.c | 20 +- |
| arch/x86/boot/header.S | 6 +- |
| arch/x86/boot/pm.c | 2 +- |
| arch/x86/boot/tools/build.c | 88 ++- |
| arch/x86/configs/i386_defconfig | 1 + |
| arch/x86/configs/x86_64_defconfig | 1 + |
| arch/x86/ia32/ia32_signal.c | 2 +- |
| arch/x86/ia32/ia32entry.S | 12 +- |
| arch/x86/ia32/sys_ia32.c | 31 +- |
| arch/x86/kernel/Makefile | 22 +- |
| arch/x86/kernel/acpi/boot.c | 67 +- |
| arch/x86/kernel/alternative.c | 103 ++- |
| arch/x86/kernel/aperture_64.c | 6 +- |
| arch/x86/kernel/apic_32.c | 224 ++++- |
| arch/x86/kernel/apic_64.c | 140 +++- |
| arch/x86/kernel/apm_32.c | 5 +- |
| arch/x86/kernel/asm-offsets_32.c | 2 +- |
| arch/x86/kernel/bugs_64.c | 14 +- |
| arch/x86/kernel/cpu/Makefile | 4 +- |
| arch/x86/kernel/cpu/amd.c | 121 ++- |
| arch/x86/kernel/cpu/centaur.c | 490 +++++----- |
| arch/x86/kernel/cpu/common.c | 182 ++-- |
| arch/x86/kernel/cpu/cpu.h | 26 +- |
| arch/x86/kernel/cpu/cyrix.c | 136 ++-- |
| arch/x86/kernel/cpu/feature_names.c | 2 +- |
| arch/x86/kernel/cpu/intel.c | 106 +- |
| arch/x86/kernel/cpu/mcheck/mce_32.c | 50 +- |
| arch/x86/kernel/cpu/mcheck/non-fatal.c | 21 +- |
| arch/x86/kernel/cpu/mcheck/p5.c | 16 +- |
| arch/x86/kernel/cpu/mcheck/p6.c | 48 +- |
| arch/x86/kernel/cpu/mcheck/winchip.c | 8 +- |
| arch/x86/kernel/cpu/mtrr/generic.c | 139 +++ |
| arch/x86/kernel/cpu/mtrr/if.c | 7 +- |
| arch/x86/kernel/cpu/mtrr/main.c | 2 +- |
| arch/x86/kernel/cpu/mtrr/state.c | 14 +- |
| arch/x86/kernel/cpu/nexgen.c | 15 +- |
| arch/x86/kernel/cpu/proc.c | 170 ++- |
| arch/x86/kernel/cpu/transmeta.c | 30 +- |
| arch/x86/kernel/cpu/umc.c | 19 +- |
| arch/x86/kernel/crash.c | 4 - |
| arch/x86/kernel/ds.c | 8 +- |
| arch/x86/kernel/e820_32.c | 27 +- |
| arch/x86/kernel/e820_64.c | 151 ++- |
| arch/x86/kernel/early_printk.c | 24 +- |
| arch/x86/kernel/efi.c | 18 +- |
| arch/x86/kernel/efi_64.c | 12 +- |
| arch/x86/kernel/entry_32.S | 39 +- |
| arch/x86/kernel/entry_64.S | 8 +- |
| arch/x86/kernel/genapic_64.c | 47 +- |
| arch/x86/kernel/genapic_flat_64.c | 7 +- |
| arch/x86/kernel/genx2apic_uv_x.c | 245 +++++ |
| arch/x86/kernel/head32.c | 14 + |
| arch/x86/kernel/head64.c | 65 +- |
| arch/x86/kernel/head_32.S | 2 +- |
| arch/x86/kernel/head_64.S | 20 +- |
| arch/x86/kernel/i387.c | 200 +++-- |
| arch/x86/kernel/io_apic_32.c | 164 ++-- |
| arch/x86/kernel/io_apic_64.c | 63 +- |
| arch/x86/kernel/ipi.c | 178 ++++ |
| arch/x86/kernel/irq_32.c | 2 +- |
| arch/x86/kernel/kprobes.c | 14 +- |
| arch/x86/kernel/mca_32.c | 96 +- |
| arch/x86/kernel/microcode.c | 16 +- |
| arch/x86/kernel/{mpparse_32.c => mpparse.c} | 850 +++++++-------- |
| arch/x86/kernel/mpparse_64.c | 867 --------------- |
| arch/x86/kernel/msr.c | 4 +- |
| arch/x86/kernel/nmi_32.c | 14 +- |
| arch/x86/kernel/nmi_64.c | 2 + |
| arch/x86/kernel/paravirt.c | 18 +- |
| arch/x86/kernel/pci-dma_64.c | 20 +- |
| arch/x86/kernel/process.c | 45 + |
| arch/x86/kernel/process_32.c | 47 +- |
| arch/x86/kernel/process_64.c | 46 +- |
| arch/x86/kernel/ptrace.c | 1 - |
| arch/x86/kernel/reboot.c | 5 +- |
| arch/x86/kernel/relocate_kernel_32.S | 30 +- |
| arch/x86/kernel/relocate_kernel_64.S | 40 +- |
| arch/x86/kernel/rtc.c | 33 +- |
| arch/x86/kernel/setup.c | 113 ++ |
| arch/x86/kernel/setup64.c | 81 +-- |
| arch/x86/kernel/setup_32.c | 91 ++- |
| arch/x86/kernel/setup_64.c | 223 ++--- |
| arch/x86/kernel/{sigframe_32.h => sigframe.h} | 14 +- |
| arch/x86/kernel/signal_32.c | 303 +++--- |
| arch/x86/kernel/signal_64.c | 108 +-- |
| arch/x86/kernel/smp.c | 343 ++++++ |
| arch/x86/kernel/smp_32.c | 712 ------------- |
| arch/x86/kernel/smp_64.c | 530 --------- |
| arch/x86/kernel/{smpboot_32.c => smpboot.c} | 1356 +++++++++++++----------- |
| arch/x86/kernel/smpboot_64.c | 1108 ------------------- |
| arch/x86/kernel/smpcommon.c | 83 ++ |
| arch/x86/kernel/smpcommon_32.c | 81 -- |
| arch/x86/kernel/srat_32.c | 10 +- |
| arch/x86/kernel/step.c | 2 +- |
| arch/x86/kernel/summit_32.c | 57 +- |
| arch/x86/kernel/syscall_64.c | 13 +- |
| arch/x86/kernel/sysprof.c | 213 ++++ |
| arch/x86/kernel/test_nx.c | 2 + |
| arch/x86/kernel/tlb_32.c | 243 +++++ |
| arch/x86/kernel/tlb_64.c | 274 +++++ |
| arch/x86/kernel/traps_32.c | 635 ++++++------ |
| arch/x86/kernel/traps_64.c | 27 +- |
| arch/x86/kernel/tsc_32.c | 16 +- |
| arch/x86/kernel/tsc_64.c | 3 +- |
| arch/x86/kernel/vm86_32.c | 213 ++-- |
| arch/x86/kernel/vmlinux_32.lds.S | 6 + |
| arch/x86/kernel/vmlinux_64.lds.S | 5 + |
| arch/x86/kernel/vsmp_64.c | 131 ++- |
| arch/x86/kernel/x8664_ksyms_64.c | 12 +- |
| arch/x86/lguest/boot.c | 2 +- |
| arch/x86/lib/memcpy_32.c | 2 +- |
| arch/x86/lib/memmove_64.c | 8 +- |
| arch/x86/lib/mmx_32.c | 197 ++-- |
| arch/x86/lib/string_32.c | 60 +- |
| arch/x86/lib/strstr_32.c | 4 +- |
| arch/x86/lib/usercopy_32.c | 122 ++-- |
| arch/x86/mach-generic/bigsmp.c | 30 +- |
| arch/x86/mach-generic/default.c | 8 +- |
| arch/x86/mach-generic/probe.c | 37 +- |
| arch/x86/mach-generic/summit.c | 8 +- |
| arch/x86/mach-rdc321x/Makefile | 2 +- |
| arch/x86/mach-rdc321x/wdt.c | 275 ----- |
| arch/x86/mach-voyager/voyager_smp.c | 17 +- |
| arch/x86/math-emu/fpu_entry.c | 5 +- |
| arch/x86/math-emu/fpu_system.h | 26 +- |
| arch/x86/math-emu/reg_ld_str.c | 17 +- |
| arch/x86/mm/Makefile | 16 +- |
| arch/x86/mm/Makefile_32 | 9 - |
| arch/x86/mm/Makefile_64 | 9 - |
| arch/x86/mm/discontig_32.c | 2 +- |
| arch/x86/mm/dump_pagetables.c | 354 ++++++ |
| arch/x86/mm/fault.c | 2 +- |
| arch/x86/mm/init_32.c | 54 +- |
| arch/x86/mm/init_64.c | 242 ++++- |
| arch/x86/mm/ioremap.c | 181 +++- |
| arch/x86/mm/numa_64.c | 6 +- |
| arch/x86/mm/pageattr.c | 105 ++- |
| arch/x86/mm/pat.c | 568 ++++++++++ |
| arch/x86/mm/pgtable_32.c | 8 +- |
| arch/x86/mm/srat_64.c | 7 +- |
| arch/x86/oprofile/init.c | 13 +- |
| arch/x86/oprofile/nmi_timer_int.c | 6 +- |
| arch/x86/oprofile/op_model_athlon.c | 46 +- |
| arch/x86/oprofile/op_model_ppro.c | 52 +- |
| arch/x86/pci/i386.c | 73 ++- |
| arch/x86/pci/irq.c | 12 +- |
| arch/x86/pci/numa.c | 32 +- |
| arch/x86/power/cpu_32.c | 41 +- |
| arch/x86/vdso/Makefile | 2 +- |
| arch/x86/vdso/vdso32-setup.c | 11 +- |
| arch/x86/xen/enlighten.c | 7 +- |
| arch/x86/xen/multicalls.c | 4 +- |
| arch/x86/xen/smp.c | 6 +- |
| arch/x86/xen/xen-asm.S | 11 +- |
| arch/x86/xen/xen-ops.h | 2 +- |
| drivers/char/mem.c | 133 ++- |
| include/asm-generic/iomap.h | 4 + |
| include/asm-generic/vmlinux.lds.h | 1 + |
| include/asm-x86/Kbuild | 1 + |
| include/asm-x86/a.out-core.h | 12 +- |
| include/asm-x86/acpi.h | 8 +- |
| include/asm-x86/alternative.h | 32 +- |
| include/asm-x86/apic.h | 7 +- |
| include/asm-x86/apicdef.h | 69 +- |
| include/asm-x86/atomic_32.h | 143 ++-- |
| include/asm-x86/atomic_64.h | 251 +++--- |
| include/asm-x86/{mach-default => }/bios_ebda.h | 0 |
| include/asm-x86/bitops.h | 54 +- |
| include/asm-x86/bitops_32.h | 40 +- |
| include/asm-x86/bitops_64.h | 40 +- |
| include/asm-x86/bug.h | 34 +- |
| include/asm-x86/byteorder.h | 39 +- |
| include/asm-x86/cacheflush.h | 80 ++- |
| include/asm-x86/checksum_32.h | 152 ++-- |
| include/asm-x86/checksum_64.h | 118 +-- |
| include/asm-x86/cmpxchg_32.h | 253 +++--- |
| include/asm-x86/cmpxchg_64.h | 134 ++-- |
| include/asm-x86/compat.h | 2 +- |
| include/asm-x86/cpufeature.h | 8 +- |
| include/asm-x86/current_32.h | 2 +- |
| include/asm-x86/current_64.h | 12 +- |
| include/asm-x86/desc.h | 61 +- |
| include/asm-x86/desc_defs.h | 15 +- |
| include/asm-x86/div64.h | 35 +- |
| include/asm-x86/dma.h | 45 +- |
| include/asm-x86/dwarf2_64.h | 9 +- |
| include/asm-x86/e820_32.h | 4 +- |
| include/asm-x86/e820_64.h | 24 +- |
| include/asm-x86/edac.h | 4 +- |
| include/asm-x86/efi.h | 2 +- |
| include/asm-x86/elf.h | 112 ++- |
| include/asm-x86/fixmap_32.h | 21 +- |
| include/asm-x86/fixmap_64.h | 20 +- |
| include/asm-x86/floppy.h | 93 +- |
| include/asm-x86/futex.h | 101 +- |
| include/asm-x86/genapic_32.h | 105 +- |
| include/asm-x86/genapic_64.h | 10 + |
| include/asm-x86/geode.h | 2 +- |
| include/asm-x86/highmem.h | 2 +- |
| include/asm-x86/hw_irq_64.h | 15 +- |
| include/asm-x86/hypertransport.h | 15 +- |
| include/asm-x86/i387.h | 109 +- |
| include/asm-x86/i8259.h | 29 +- |
| include/asm-x86/ia32.h | 62 +- |
| include/asm-x86/ide.h | 58 +- |
| include/asm-x86/io.h | 14 + |
| include/asm-x86/io_32.h | 143 ++-- |
| include/asm-x86/io_64.h | 116 ++- |
| include/asm-x86/io_apic.h | 8 +- |
| include/asm-x86/ioctls.h | 13 +- |
| include/asm-x86/ipcbuf.h | 3 +- |
| include/asm-x86/ipi.h | 11 +- |
| include/asm-x86/irq_32.h | 2 +- |
| include/asm-x86/irq_64.h | 4 +- |
| include/asm-x86/irqflags.h | 59 +- |
| include/asm-x86/kdebug.h | 4 +- |
| include/asm-x86/kexec.h | 71 +- |
| include/asm-x86/kprobes.h | 12 +- |
| include/asm-x86/kvm_host.h | 24 +- |
| include/asm-x86/kvm_x86_emulate.h | 28 +- |
| include/asm-x86/lguest.h | 11 +- |
| include/asm-x86/lguest_hcall.h | 5 +- |
| include/asm-x86/linkage.h | 5 +- |
| include/asm-x86/local.h | 105 +- |
| include/asm-x86/mach-bigsmp/mach_apic.h | 18 +- |
| include/asm-x86/mach-default/mach_apic.h | 95 +- |
| include/asm-x86/mach-default/mach_apicdef.h | 9 +- |
| include/asm-x86/mach-default/mach_ipi.h | 10 + |
| include/asm-x86/mach-default/mach_mpparse.h | 11 - |
| include/asm-x86/mach-default/mach_reboot.h | 61 -- |
| include/asm-x86/mach-default/smpboot_hooks.h | 7 + |
| include/asm-x86/mach-es7000/mach_apic.h | 20 +- |
| include/asm-x86/mach-es7000/mach_mpparse.h | 11 - |
| include/asm-x86/mach-generic/mach_apic.h | 1 - |
| include/asm-x86/mach-generic/mach_mpparse.h | 5 - |
| include/asm-x86/mach-numaq/mach_apic.h | 10 + |
| include/asm-x86/mach-numaq/mach_mpparse.h | 23 +- |
| include/asm-x86/mach-summit/mach_apic.h | 14 +- |
| include/asm-x86/mach-summit/mach_mpparse.h | 11 - |
| include/asm-x86/mach-visws/mach_apic.h | 2 +- |
| include/asm-x86/mach-visws/smpboot_hooks.h | 4 + |
| include/asm-x86/mach_apic.h | 29 - |
| include/asm-x86/mc146818rtc.h | 16 +- |
| include/asm-x86/mca_dma.h | 34 +- |
| include/asm-x86/mmu.h | 4 +- |
| include/asm-x86/mmu_context_32.h | 12 +- |
| include/asm-x86/mmu_context_64.h | 21 +- |
| include/asm-x86/mmx.h | 2 +- |
| include/asm-x86/mmzone_32.h | 4 +- |
| include/asm-x86/mmzone_64.h | 24 +- |
| include/asm-x86/mpspec.h | 47 +- |
| include/asm-x86/mpspec_def.h | 46 +- |
| include/asm-x86/msidef.h | 12 +- |
| include/asm-x86/msr-index.h | 4 + |
| include/asm-x86/msr.h | 89 +- |
| include/asm-x86/mtrr.h | 73 +- |
| include/asm-x86/mutex_32.h | 66 +- |
| include/asm-x86/mutex_64.h | 73 +- |
| include/asm-x86/nmi.h | 94 ++- |
| include/asm-x86/nmi_32.h | 61 -- |
| include/asm-x86/nmi_64.h | 90 -- |
| include/asm-x86/nops.h | 2 + |
| include/asm-x86/numa_64.h | 5 +- |
| include/asm-x86/numaq.h | 9 +- |
| include/asm-x86/page.h | 5 +- |
| include/asm-x86/page_32.h | 9 +- |
| include/asm-x86/page_64.h | 8 +- |
| include/asm-x86/param.h | 4 +- |
| include/asm-x86/paravirt.h | 54 +- |
| include/asm-x86/parport.h | 6 +- |
| include/asm-x86/pat.h | 16 + |
| include/asm-x86/pci-direct.h | 2 +- |
| include/asm-x86/pci.h | 8 +- |
| include/asm-x86/pci_64.h | 14 +- |
| include/asm-x86/pda.h | 83 +- |
| include/asm-x86/percpu.h | 104 +- |
| include/asm-x86/pgtable-2level.h | 18 +- |
| include/asm-x86/pgtable-3level.h | 48 +- |
| include/asm-x86/pgtable.h | 187 +++- |
| include/asm-x86/pgtable_32.h | 100 +- |
| include/asm-x86/pgtable_64.h | 149 ++-- |
| include/asm-x86/posix_types.h | 8 +- |
| include/asm-x86/posix_types_32.h | 47 +- |
| include/asm-x86/posix_types_64.h | 54 +- |
| include/asm-x86/processor.h | 736 +++++++------ |
| include/asm-x86/proto.h | 6 +- |
| include/asm-x86/ptrace.h | 46 +- |
| include/asm-x86/reboot.h | 3 +- |
| include/asm-x86/resume-trace.h | 15 +- |
| include/asm-x86/rio.h | 76 +- |
| include/asm-x86/rwsem.h | 169 ++-- |
| include/asm-x86/segment.h | 3 +- |
| include/asm-x86/semaphore_32.h | 104 +- |
| include/asm-x86/semaphore_64.h | 98 +- |
| include/asm-x86/setup.h | 8 +- |
| include/asm-x86/sigcontext.h | 7 +- |
| include/asm-x86/sigcontext32.h | 4 +- |
| include/asm-x86/signal.h | 48 +- |
| include/asm-x86/smp.h | 223 ++++- |
| include/asm-x86/smp_32.h | 165 --- |
| include/asm-x86/smp_64.h | 101 -- |
| include/asm-x86/sparsemem.h | 6 +- |
| include/asm-x86/spinlock.h | 117 +-- |
| include/asm-x86/srat.h | 2 +- |
| include/asm-x86/stackprotector.h | 38 + |
| include/asm-x86/string_32.h | 2 +- |
| include/asm-x86/string_64.h | 66 +- |
| include/asm-x86/suspend_32.h | 12 +- |
| include/asm-x86/suspend_64.h | 5 +- |
| include/asm-x86/swiotlb.h | 28 +- |
| include/asm-x86/sync_bitops.h | 77 +- |
| include/asm-x86/system.h | 230 +++-- |
| include/asm-x86/tce.h | 2 +- |
| include/asm-x86/thread_info.h | 9 + |
| include/asm-x86/thread_info_32.h | 90 +- |
| include/asm-x86/thread_info_64.h | 80 +- |
| include/asm-x86/tlbflush.h | 5 +- |
| include/asm-x86/topology.h | 23 +- |
| include/asm-x86/tsc.h | 2 +- |
| include/asm-x86/uaccess_32.h | 316 ++++--- |
| include/asm-x86/uaccess_64.h | 376 ++++--- |
| include/asm-x86/unaligned.h | 2 +- |
| include/asm-x86/unistd.h | 8 +- |
| include/asm-x86/unistd_32.h | 2 +- |
| include/asm-x86/unistd_64.h | 2 +- |
| include/asm-x86/user32.h | 7 +- |
| include/asm-x86/user_32.h | 6 +- |
| include/asm-x86/user_64.h | 16 +- |
| include/asm-x86/uv/uv_hub.h | 284 +++++ |
| include/asm-x86/uv/uv_mmrs.h | 373 +++++++ |
| include/asm-x86/vdso.h | 23 +- |
| include/asm-x86/vga.h | 4 +- |
| include/asm-x86/vm86.h | 23 +- |
| include/asm-x86/vmi.h | 88 +- |
| include/asm-x86/voyager.h | 51 +- |
| include/asm-x86/xor_32.h | 494 +++++----- |
| include/asm-x86/xor_64.h | 294 +++--- |
| include/linux/compiler-gcc.h | 13 +- |
| include/linux/efi.h | 7 + |
| include/linux/percpu.h | 7 + |
| include/linux/sched.h | 5 +- |
| include/linux/stackprotector.h | 16 + |
| init/main.c | 7 + |
| kernel/fork.c | 31 +- |
| kernel/panic.c | 71 ++- |
| lib/Kconfig.debug | 1 - |
| 358 files changed, 14293 insertions(+), 12170 deletions(-) |
| create mode 100644 Documentation/x86/pat.txt |
| create mode 100644 arch/x86/kernel/genx2apic_uv_x.c |
| create mode 100644 arch/x86/kernel/head32.c |
| create mode 100644 arch/x86/kernel/ipi.c |
| rename arch/x86/kernel/{mpparse_32.c => mpparse.c} (53%) |
| delete mode 100644 arch/x86/kernel/mpparse_64.c |
| create mode 100644 arch/x86/kernel/process.c |
| create mode 100644 arch/x86/kernel/setup.c |
| rename arch/x86/kernel/{sigframe_32.h => sigframe.h} (66%) |
| create mode 100644 arch/x86/kernel/smp.c |
| delete mode 100644 arch/x86/kernel/smp_32.c |
| delete mode 100644 arch/x86/kernel/smp_64.c |
| rename arch/x86/kernel/{smpboot_32.c => smpboot.c} (62%) |
| delete mode 100644 arch/x86/kernel/smpboot_64.c |
| create mode 100644 arch/x86/kernel/smpcommon.c |
| create mode 100644 arch/x86/kernel/sysprof.c |
| create mode 100644 arch/x86/kernel/tlb_32.c |
| create mode 100644 arch/x86/kernel/tlb_64.c |
| delete mode 100644 arch/x86/mach-rdc321x/wdt.c |
| delete mode 100644 arch/x86/mm/Makefile_32 |
| delete mode 100644 arch/x86/mm/Makefile_64 |
| create mode 100644 arch/x86/mm/dump_pagetables.c |
| create mode 100644 arch/x86/mm/pat.c |
| rename include/asm-x86/{mach-default => }/bios_ebda.h (100%) |
| delete mode 100644 include/asm-x86/mach-default/mach_reboot.h |
| delete mode 100644 include/asm-x86/mach_apic.h |
| delete mode 100644 include/asm-x86/nmi_32.h |
| delete mode 100644 include/asm-x86/nmi_64.h |
| create mode 100644 include/asm-x86/pat.h |
| delete mode 100644 include/asm-x86/smp_32.h |
| delete mode 100644 include/asm-x86/smp_64.h |
| create mode 100644 include/asm-x86/stackprotector.h |
| create mode 100644 include/asm-x86/uv/uv_hub.h |
| create mode 100644 include/asm-x86/uv/uv_mmrs.h |
| create mode 100644 include/linux/stackprotector.h |
| Merging sched/for-akpm |
| $ git merge sched/for-akpm |
| Auto-merged arch/x86/Kconfig |
| Auto-merged arch/x86/kernel/Makefile |
| Auto-merged arch/x86/kernel/alternative.c |
| Auto-merged arch/x86/kernel/entry_32.S |
| Auto-merged arch/x86/kernel/entry_64.S |
| Auto-merged arch/x86/kernel/process_32.c |
| Auto-merged arch/x86/kernel/process_64.c |
| Auto-merged include/asm-x86/alternative.h |
| Auto-merged include/asm-x86/irqflags.h |
| Auto-merged include/linux/sched.h |
| Auto-merged init/main.c |
| Auto-merged kernel/fork.c |
| Auto-merged lib/Kconfig.debug |
| Merge made by recursive. |
| Makefile | 4 + |
| arch/x86/Kconfig | 1 + |
| arch/x86/kernel/Makefile | 1 + |
| arch/x86/kernel/alternative.c | 4 +- |
| arch/x86/kernel/entry_32.S | 68 + |
| arch/x86/kernel/entry_64.S | 102 ++ |
| arch/x86/kernel/ftrace.c | 159 ++ |
| arch/x86/kernel/machine_kexec_32.c | 4 + |
| arch/x86/kernel/machine_kexec_64.c | 4 + |
| arch/x86/kernel/process_32.c | 3 + |
| arch/x86/kernel/process_64.c | 3 + |
| arch/x86/kernel/vsyscall_64.c | 3 +- |
| arch/x86/lib/Makefile | 1 + |
| arch/x86/lib/thunk_32.S | 47 + |
| arch/x86/lib/thunk_64.S | 19 +- |
| arch/x86/vdso/vclock_gettime.c | 15 +- |
| arch/x86/vdso/vgetcpu.c | 3 +- |
| include/asm-x86/alternative.h | 2 + |
| include/asm-x86/irqflags.h | 24 +- |
| include/asm-x86/vsyscall.h | 3 +- |
| include/linux/ftrace.h | 123 ++ |
| include/linux/irqflags.h | 13 +- |
| include/linux/ktime.h | 6 + |
| include/linux/linkage.h | 2 + |
| include/linux/preempt.h | 34 +- |
| include/linux/rcupdate.h | 2 - |
| include/linux/sched.h | 71 +- |
| include/linux/seqlock.h | 46 +- |
| init/main.c | 17 + |
| kernel/Makefile | 10 + |
| kernel/fork.c | 2 +- |
| kernel/kthread.c | 1 + |
| kernel/latencytop.c | 27 +- |
| kernel/lockdep.c | 30 +- |
| kernel/printk.c | 31 +- |
| kernel/rcupreempt.c | 2 - |
| kernel/sched.c | 501 +++++-- |
| kernel/sched_debug.c | 1 - |
| kernel/sched_fair.c | 21 +- |
| kernel/sched_rt.c | 185 ++- |
| kernel/softirq.c | 63 +- |
| kernel/softlockup.c | 4 +- |
| kernel/spinlock.c | 2 +- |
| kernel/sysctl.c | 26 +- |
| kernel/time/tick-sched.c | 5 - |
| kernel/trace/Kconfig | 131 ++ |
| kernel/trace/Makefile | 23 + |
| kernel/trace/ftrace.c | 1396 +++++++++++++++++ |
| kernel/trace/trace.c | 2685 +++++++++++++++++++++++++++++++++ |
| kernel/trace/trace.h | 301 ++++ |
| kernel/trace/trace_functions.c | 76 + |
| kernel/trace/trace_irqsoff.c | 502 ++++++ |
| kernel/trace/trace_sched_switch.c | 183 +++ |
| kernel/trace/trace_sched_wakeup.c | 288 ++++ |
| kernel/trace/trace_selftest.c | 551 +++++++ |
| kernel/trace/trace_selftest_dynamic.c | 7 + |
| kernel/trace/trace_sysprof.c | 355 +++++ |
| kernel/user.c | 28 + |
| lib/Kconfig.debug | 2 + |
| lib/Makefile | 9 + |
| lib/smp_processor_id.c | 6 +- |
| 61 files changed, 7954 insertions(+), 284 deletions(-) |
| create mode 100644 arch/x86/kernel/ftrace.c |
| create mode 100644 arch/x86/lib/thunk_32.S |
| create mode 100644 include/linux/ftrace.h |
| create mode 100644 kernel/trace/Kconfig |
| create mode 100644 kernel/trace/Makefile |
| create mode 100644 kernel/trace/ftrace.c |
| create mode 100644 kernel/trace/trace.c |
| create mode 100644 kernel/trace/trace.h |
| create mode 100644 kernel/trace/trace_functions.c |
| create mode 100644 kernel/trace/trace_irqsoff.c |
| create mode 100644 kernel/trace/trace_sched_switch.c |
| create mode 100644 kernel/trace/trace_sched_wakeup.c |
| create mode 100644 kernel/trace/trace_selftest.c |
| create mode 100644 kernel/trace/trace_selftest_dynamic.c |
| create mode 100644 kernel/trace/trace_sysprof.c |
| Merging quilt/device-mapper |
| $ git merge quilt/device-mapper |
| Already up-to-date. |
| Merging hid/mm |
| $ git merge hid/mm |
| Auto-merged drivers/hid/hid-core.c |
| Auto-merged drivers/hid/usbhid/hid-core.c |
| Auto-merged drivers/hid/usbhid/hid-quirks.c |
| Auto-merged include/linux/Kbuild |
| Merge made by recursive. |
| drivers/hid/hid-core.c | 19 ++- |
| drivers/hid/hid-debug.c | 2 +- |
| drivers/hid/hid-input-quirks.c | 24 +++- |
| drivers/hid/usbhid/Kconfig | 12 ++- |
| drivers/hid/usbhid/Makefile | 3 + |
| drivers/hid/usbhid/hid-core.c | 69 ++++++---- |
| drivers/hid/usbhid/hid-ff.c | 3 + |
| drivers/hid/usbhid/hid-lg2ff.c | 114 ++++++++++++++++ |
| drivers/hid/usbhid/hid-quirks.c | 83 ++++++++---- |
| drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- |
| drivers/hid/usbhid/usbhid.h | 3 +- |
| include/linux/Kbuild | 2 + |
| include/linux/hid.h | 17 ++- |
| include/linux/hidraw.h | 1 + |
| 14 files changed, 430 insertions(+), 208 deletions(-) |
| create mode 100644 drivers/hid/usbhid/hid-lg2ff.c |
| Merging quilt/i2c |
| $ git merge quilt/i2c |
| Auto-merged MAINTAINERS |
| Removed drivers/i2c/algos/i2c-algo-pca.h |
| Merge made by recursive. |
| MAINTAINERS | 2 + |
| drivers/i2c/algos/Kconfig | 39 +-- |
| drivers/i2c/algos/i2c-algo-pca.c | 126 ++++---- |
| drivers/i2c/algos/i2c-algo-pca.h | 26 -- |
| drivers/i2c/busses/Kconfig | 73 +++-- |
| drivers/i2c/busses/Makefile | 3 + |
| drivers/i2c/busses/i2c-at91.c | 2 +- |
| drivers/i2c/busses/i2c-au1550.c | 1 + |
| drivers/i2c/busses/i2c-bfin-twi.c | 475 +++++++++++++++++---------- |
| drivers/i2c/busses/i2c-davinci.c | 26 +- |
| drivers/i2c/busses/i2c-gpio.c | 1 + |
| drivers/i2c/busses/i2c-ibm_iic.c | 199 +++++++++++- |
| drivers/i2c/busses/i2c-iop3xx.c | 1 + |
| drivers/i2c/busses/i2c-ixp2000.c | 1 + |
| drivers/i2c/busses/i2c-mpc.c | 3 + |
| drivers/i2c/busses/i2c-ocores.c | 3 + |
| drivers/i2c/busses/i2c-omap.c | 1 + |
| drivers/i2c/busses/i2c-pca-isa.c | 53 ++-- |
| drivers/i2c/busses/i2c-pca-platform.c | 298 +++++++++++++++++ |
| drivers/i2c/busses/i2c-pmcmsp.c | 7 +- |
| drivers/i2c/busses/i2c-pnx.c | 45 ++-- |
| drivers/i2c/busses/i2c-powermac.c | 3 + |
| drivers/i2c/busses/i2c-pxa.c | 3 +- |
| drivers/i2c/busses/i2c-s3c2410.c | 5 +- |
| drivers/i2c/busses/i2c-sh7760.c | 577 +++++++++++++++++++++++++++++++++ |
| drivers/i2c/busses/i2c-sh_mobile.c | 500 ++++++++++++++++++++++++++++ |
| drivers/i2c/busses/i2c-simtec.c | 3 + |
| drivers/i2c/busses/i2c-tiny-usb.c | 12 +- |
| drivers/i2c/busses/i2c-versatile.c | 1 + |
| drivers/i2c/busses/scx200_acb.c | 2 +- |
| drivers/i2c/chips/isp1301_omap.c | 87 +++--- |
| drivers/i2c/i2c-core.c | 2 +- |
| drivers/i2c/i2c-dev.c | 329 ++++++++++--------- |
| include/asm-sh/i2c-sh7760.h | 22 ++ |
| include/linux/i2c-algo-pca.h | 37 ++- |
| include/linux/i2c-pca-platform.h | 12 + |
| 36 files changed, 2360 insertions(+), 620 deletions(-) |
| delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h |
| create mode 100644 drivers/i2c/busses/i2c-pca-platform.c |
| create mode 100644 drivers/i2c/busses/i2c-sh7760.c |
| create mode 100644 drivers/i2c/busses/i2c-sh_mobile.c |
| create mode 100644 include/asm-sh/i2c-sh7760.h |
| create mode 100644 include/linux/i2c-pca-platform.h |
| Merging quilt/kernel-doc |
| $ git merge quilt/kernel-doc |
| Auto-merged Documentation/00-INDEX |
| Merge made by recursive. |
| Documentation/00-INDEX | 2 - |
| Documentation/DMA-API.txt | 4 +- |
| Documentation/DocBook/kernel-locking.tmpl | 25 ++++- |
| Documentation/kbuild/00-INDEX | 4 + |
| Documentation/kbuild/make-configs.txt | 188 +++++++++++++++++++++++++++ |
| Documentation/{ => kbuild}/smart-config.txt | 2 +- |
| Documentation/spi/spidev | 168 +----------------------- |
| Documentation/spi/spidev_fdx.c | 158 ++++++++++++++++++++++ |
| README | 32 +++-- |
| scripts/kernel-doc | 25 +++- |
| 10 files changed, 417 insertions(+), 191 deletions(-) |
| create mode 100644 Documentation/kbuild/make-configs.txt |
| rename Documentation/{ => kbuild}/smart-config.txt (99%) |
| create mode 100644 Documentation/spi/spidev_fdx.c |
| Merging avr32/avr32-arch |
| $ git merge avr32/avr32-arch |
| Removed arch/avr32/mach-at32ap/time-tc.c |
| Auto-merged drivers/usb/gadget/Kconfig |
| 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 | 302 ++++++++++++++++++++++++++++++++ |
| drivers/misc/Kconfig | 33 ++++ |
| drivers/misc/Makefile | 1 + |
| drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ |
| drivers/usb/gadget/Kconfig | 4 +- |
| drivers/usb/gadget/atmel_usba_udc.c | 156 ++++++++--------- |
| drivers/usb/gadget/atmel_usba_udc.h | 9 + |
| 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/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ |
| include/linux/usb/atmel_usba_udc.h | 22 +++ |
| 28 files changed, 1305 insertions(+), 766 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 |
| Merging v4l-dvb/stable |
| $ git merge v4l-dvb/stable |
| Merge made by recursive. |
| Documentation/video4linux/CARDLIST.bttv | 2 + |
| Documentation/video4linux/CARDLIST.cx88 | 9 + |
| Documentation/video4linux/CARDLIST.saa7134 | 9 + |
| arch/arm/mach-pxa/devices.c | 32 + |
| arch/arm/mach-pxa/pcm990-baseboard.c | 86 + |
| drivers/media/Kconfig | 2 +- |
| drivers/media/common/ir-functions.c | 2 +- |
| drivers/media/common/ir-keymaps.c | 96 ++- |
| drivers/media/common/saa7146_vbi.c | 4 +- |
| drivers/media/common/saa7146_video.c | 4 +- |
| drivers/media/dvb/b2c2/Kconfig | 1 + |
| drivers/media/dvb/b2c2/Makefile | 1 + |
| drivers/media/dvb/b2c2/flexcop-common.h | 17 +- |
| drivers/media/dvb/b2c2/flexcop-eeprom.c | 9 +- |
| drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 113 +- |
| drivers/media/dvb/b2c2/flexcop-i2c.c | 180 ++- |
| drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- |
| drivers/media/dvb/b2c2/flexcop-usb.c | 17 +- |
| drivers/media/dvb/b2c2/flexcop.c | 10 +- |
| drivers/media/dvb/bt8xx/Kconfig | 2 +- |
| drivers/media/dvb/bt8xx/Makefile | 5 +- |
| drivers/media/dvb/bt8xx/dvb-bt8xx.c | 14 +- |
| drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 +- |
| drivers/media/dvb/dvb-core/demux.h | 2 + |
| drivers/media/dvb/dvb-core/dmxdev.c | 10 +- |
| drivers/media/dvb/dvb-core/dvb_demux.c | 2 +- |
| drivers/media/dvb/dvb-core/dvb_net.c | 2 +- |
| drivers/media/dvb/dvb-core/dvbdev.c | 2 +- |
| drivers/media/dvb/dvb-usb/Kconfig | 1 + |
| drivers/media/dvb/dvb-usb/cxusb.c | 13 +- |
| drivers/media/dvb/dvb-usb/dib0700.h | 4 + |
| drivers/media/dvb/dvb-usb/dib0700_core.c | 4 +- |
| drivers/media/dvb/dvb-usb/dib0700_devices.c | 325 ++++- |
| drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 13 +- |
| drivers/media/dvb/dvb-usb/ttusb2.c | 62 +- |
| drivers/media/dvb/frontends/Kconfig | 7 + |
| drivers/media/dvb/frontends/Makefile | 1 + |
| drivers/media/dvb/frontends/cx22702.c | 2 +- |
| drivers/media/dvb/frontends/cx24123.c | 304 +++-- |
| drivers/media/dvb/frontends/cx24123.h | 21 +- |
| drivers/media/dvb/frontends/dvb-pll.c | 260 +--- |
| drivers/media/dvb/frontends/dvb-pll.h | 31 +- |
| 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/tda1004x.h | 1 - |
| drivers/media/dvb/frontends/tda10086.c | 2 +- |
| drivers/media/dvb/frontends/tda18271-common.c | 57 +- |
| drivers/media/dvb/frontends/tda18271-fe.c | 418 ++--- |
| drivers/media/dvb/frontends/tda18271-priv.h | 16 +- |
| drivers/media/dvb/frontends/tda18271-tables.c | 84 +- |
| drivers/media/dvb/frontends/tda18271.h | 23 +- |
| drivers/media/dvb/frontends/tda826x.c | 2 +- |
| drivers/media/dvb/frontends/tda827x.c | 167 +- |
| drivers/media/dvb/frontends/tda827x.h | 4 +- |
| 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/dsbr100.c | 2 + |
| drivers/media/radio/miropcm20-radio.c | 2 + |
| drivers/media/radio/miropcm20-rds.c | 2 +- |
| drivers/media/radio/radio-aimslab.c | 2 + |
| drivers/media/radio/radio-aztech.c | 2 + |
| drivers/media/radio/radio-cadet.c | 12 +- |
| drivers/media/radio/radio-gemtek-pci.c | 2 + |
| drivers/media/radio/radio-gemtek.c | 2 + |
| drivers/media/radio/radio-maestro.c | 2 + |
| drivers/media/radio/radio-maxiradio.c | 2 + |
| drivers/media/radio/radio-rtrack2.c | 2 + |
| drivers/media/radio/radio-sf16fmi.c | 2 + |
| drivers/media/radio/radio-sf16fmr2.c | 104 +- |
| drivers/media/radio/radio-si470x.c | 59 +- |
| drivers/media/radio/radio-terratec.c | 2 + |
| drivers/media/radio/radio-trust.c | 2 + |
| drivers/media/radio/radio-typhoon.c | 4 +- |
| drivers/media/radio/radio-zoltrix.c | 2 + |
| drivers/media/video/Kconfig | 45 + |
| drivers/media/video/Makefile | 9 +- |
| drivers/media/video/adv7170.c | 2 +- |
| drivers/media/video/adv7175.c | 2 +- |
| drivers/media/video/arv.c | 6 +- |
| drivers/media/video/bt819.c | 2 +- |
| drivers/media/video/bt856.c | 2 +- |
| drivers/media/video/bt8xx/bttv-cards.c | 55 +- |
| drivers/media/video/bt8xx/bttv-driver.c | 33 +- |
| drivers/media/video/bt8xx/bttv-input.c | 6 + |
| drivers/media/video/bt8xx/bttv-vbi.c | 2 +- |
| drivers/media/video/bt8xx/bttv.h | 3 + |
| drivers/media/video/bt8xx/bttvp.h | 1 - |
| drivers/media/video/bw-qcam.c | 6 +- |
| drivers/media/video/c-qcam.c | 6 +- |
| drivers/media/video/cafe_ccic.c | 4 +- |
| drivers/media/video/cpia.c | 2 + |
| drivers/media/video/cpia2/cpia2_core.c | 4 +- |
| drivers/media/video/cpia2/cpia2_usb.c | 2 +- |
| drivers/media/video/cpia2/cpia2_v4l.c | 2 + |
| drivers/media/video/cx23885/cx23885-core.c | 2 +- |
| drivers/media/video/cx23885/cx23885-dvb.c | 15 +- |
| drivers/media/video/cx23885/cx23885-i2c.c | 2 +- |
| drivers/media/video/cx23885/cx23885-video.c | 4 +- |
| drivers/media/video/cx25840/cx25840-core.c | 91 +- |
| drivers/media/video/cx25840/cx25840-core.h | 2 +- |
| drivers/media/video/cx25840/cx25840-firmware.c | 11 +- |
| drivers/media/video/cx25840/cx25840-vbi.c | 6 +- |
| drivers/media/video/cx88/Kconfig | 1 + |
| drivers/media/video/cx88/cx88-alsa.c | 8 +- |
| drivers/media/video/cx88/cx88-blackbird.c | 10 +- |
| drivers/media/video/cx88/cx88-cards.c | 581 ++++++- |
| drivers/media/video/cx88/cx88-core.c | 13 +- |
| drivers/media/video/cx88/cx88-dvb.c | 245 +++- |
| drivers/media/video/cx88/cx88-i2c.c | 4 +- |
| drivers/media/video/cx88/cx88-input.c | 15 +- |
| 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 | 63 +- |
| drivers/media/video/cx88/cx88.h | 14 +- |
| drivers/media/video/dabfirmware.h | 7 + |
| drivers/media/video/dabusb.c | 8 +- |
| drivers/media/video/dpc7146.c | 4 +- |
| drivers/media/video/em28xx/em28xx-cards.c | 2 +- |
| drivers/media/video/em28xx/em28xx-core.c | 24 +- |
| drivers/media/video/em28xx/em28xx-i2c.c | 4 +- |
| drivers/media/video/em28xx/em28xx-video.c | 2 +- |
| drivers/media/video/et61x251/et61x251_core.c | 4 +- |
| drivers/media/video/hexium_gemini.c | 4 +- |
| drivers/media/video/hexium_orion.c | 4 +- |
| drivers/media/video/ir-kbd-i2c.c | 26 +- |
| drivers/media/video/ivtv/ivtv-cards.c | 7 +- |
| drivers/media/video/ivtv/ivtv-cards.h | 2 +- |
| drivers/media/video/ivtv/ivtv-driver.c | 44 +- |
| drivers/media/video/ivtv/ivtv-driver.h | 2 + |
| drivers/media/video/ivtv/ivtv-fileops.c | 2 +- |
| drivers/media/video/ivtv/ivtv-ioctl.c | 36 +- |
| drivers/media/video/ivtv/ivtv-irq.c | 25 +- |
| drivers/media/video/ivtv/ivtv-queue.c | 4 +- |
| drivers/media/video/ivtv/ivtv-yuv.c | 38 +- |
| drivers/media/video/meye.c | 14 +- |
| drivers/media/video/msp3400-kthreads.c | 15 +- |
| drivers/media/video/mt20xx.c | 7 +- |
| drivers/media/video/mt9m001.c | 722 ++++++++ |
| drivers/media/video/mt9v022.c | 844 ++++++++++ |
| drivers/media/video/mxb.c | 4 +- |
| drivers/media/video/ov511.c | 2 + |
| drivers/media/video/pms.c | 6 +- |
| 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 | 52 +- |
| 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 | 10 +- |
| drivers/media/video/pxa_camera.c | 1000 +++++++++++ |
| drivers/media/video/saa5249.c | 2 + |
| 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 | 4 +- |
| drivers/media/video/saa711x.c | 2 +- |
| drivers/media/video/saa7134/Kconfig | 1 + |
| drivers/media/video/saa7134/saa7134-alsa.c | 12 +- |
| drivers/media/video/saa7134/saa7134-cards.c | 427 +++++- |
| drivers/media/video/saa7134/saa7134-core.c | 52 +- |
| drivers/media/video/saa7134/saa7134-dvb.c | 418 ++++-- |
| 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-reg.h | 3 + |
| drivers/media/video/saa7134/saa7134-ts.c | 2 +- |
| drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +- |
| drivers/media/video/saa7134/saa7134-vbi.c | 2 +- |
| drivers/media/video/saa7134/saa7134-video.c | 17 +- |
| drivers/media/video/saa7134/saa7134.h | 22 +- |
| drivers/media/video/saa7185.c | 2 +- |
| drivers/media/video/se401.c | 6 +- |
| drivers/media/video/sn9c102/sn9c102_core.c | 12 +- |
| drivers/media/video/sn9c102/sn9c102_sensor.h | 5 +- |
| drivers/media/video/soc_camera.c | 1033 ++++++++++++ |
| drivers/media/video/stk-webcam.c | 4 +- |
| drivers/media/video/stradis.c | 6 +- |
| drivers/media/video/stv680.c | 11 +- |
| drivers/media/video/tda8290.c | 12 +- |
| drivers/media/video/tda8290.h | 2 +- |
| drivers/media/video/tda9840.c | 2 +- |
| drivers/media/video/tda9887.c | 42 +- |
| 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 | 47 +- |
| drivers/media/video/tuner-i2c.h | 118 ++- |
| drivers/media/video/tuner-simple.c | 861 ++++++++--- |
| drivers/media/video/tuner-simple.h | 11 +- |
| drivers/media/video/tuner-types.c | 188 ++- |
| drivers/media/video/tuner-xc2028.c | 57 +- |
| 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 | 8 +- |
| drivers/media/video/usbvideo/vicam.c | 2 + |
| drivers/media/video/usbvision/usbvision-core.c | 45 +- |
| drivers/media/video/usbvision/usbvision-i2c.c | 8 +- |
| drivers/media/video/usbvision/usbvision-video.c | 46 +- |
| drivers/media/video/v4l1-compat.c | 1737 +++++++++++--------- |
| drivers/media/video/videobuf-core.c | 168 ++- |
| drivers/media/video/videobuf-dma-sg.c | 137 +- |
| drivers/media/video/videobuf-dvb.c | 2 +- |
| drivers/media/video/videobuf-vmalloc.c | 49 +- |
| drivers/media/video/videocodec.c | 4 +- |
| drivers/media/video/vino.c | 10 +- |
| drivers/media/video/vivi.c | 334 ++--- |
| drivers/media/video/vpx3220.c | 2 +- |
| drivers/media/video/w9966.c | 6 +- |
| drivers/media/video/w9968cf.c | 4 +- |
| drivers/media/video/zc0301/zc0301_core.c | 4 +- |
| drivers/media/video/zoran_card.c | 6 +- |
| drivers/media/video/zoran_card.h | 2 + |
| drivers/media/video/zoran_device.c | 12 +- |
| drivers/media/video/zoran_driver.c | 4 +- |
| 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 | 55 +- |
| include/media/ir-common.h | 2 + |
| include/media/soc_camera.h | 179 ++ |
| include/media/tuner-types.h | 17 +- |
| include/media/tuner.h | 2 +- |
| include/media/v4l2-chip-ident.h | 6 + |
| include/media/videobuf-core.h | 9 +- |
| include/media/videobuf-dma-sg.h | 14 +- |
| 255 files changed, 11100 insertions(+), 3609 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 |
| Merging s390/features |
| $ git merge s390/features |
| Merge made by recursive. |
| Documentation/s390/s390dbf.txt | 21 ++ |
| arch/s390/Kconfig | 33 +--- |
| arch/s390/crypto/aes_s390.c | 8 +- |
| arch/s390/crypto/des_s390.c | 8 +- |
| arch/s390/crypto/sha1_s390.c | 8 +- |
| arch/s390/crypto/sha256_s390.c | 8 +- |
| arch/s390/defconfig | 1 + |
| arch/s390/kernel/Makefile | 2 +- |
| arch/s390/kernel/compat_linux.h | 73 +++++++ |
| arch/s390/kernel/compat_signal.c | 11 + |
| arch/s390/kernel/debug.c | 53 ++++-- |
| arch/s390/kernel/early.c | 1 + |
| arch/s390/kernel/entry.h | 60 ++++++ |
| arch/s390/kernel/ipl.c | 2 +- |
| arch/s390/kernel/kprobes.c | 2 +- |
| arch/s390/kernel/process.c | 76 ++++---- |
| arch/s390/kernel/ptrace.c | 1 + |
| arch/s390/kernel/s390_ext.c | 14 +- |
| arch/s390/kernel/setup.c | 15 ++- |
| arch/s390/kernel/signal.c | 16 +- |
| arch/s390/kernel/smp.c | 91 ++++++++- |
| arch/s390/kernel/sys_s390.c | 2 +- |
| arch/s390/kernel/time.c | 259 ++++++++------------------ |
| arch/s390/kernel/topology.c | 314 +++++++++++++++++++++++++++++++ |
| arch/s390/kernel/traps.c | 7 +- |
| arch/s390/lib/delay.c | 14 +- |
| arch/s390/lib/uaccess_pt.c | 61 ++++-- |
| arch/s390/mm/fault.c | 21 +-- |
| arch/s390/mm/init.c | 1 - |
| drivers/base/topology.c | 17 +- |
| drivers/char/hw_random/core.c | 4 + |
| drivers/crypto/Kconfig | 1 + |
| drivers/s390/block/Kconfig | 1 + |
| drivers/s390/block/dasd.c | 10 +- |
| drivers/s390/block/dasd_3990_erp.c | 34 ++++ |
| drivers/s390/block/dasd_alias.c | 49 ++--- |
| drivers/s390/block/dasd_eckd.c | 7 + |
| drivers/s390/block/dasd_fba.c | 3 +- |
| drivers/s390/block/dasd_int.h | 6 + |
| drivers/s390/char/sclp_tty.c | 2 +- |
| drivers/s390/char/sclp_vt220.c | 13 +- |
| drivers/s390/char/tape_34xx.c | 2 +- |
| drivers/s390/char/tape_char.c | 4 +- |
| drivers/s390/char/tape_class.c | 5 +- |
| drivers/s390/char/tape_class.h | 2 +- |
| drivers/s390/char/vmur.c | 24 ++- |
| drivers/s390/char/vmur.h | 4 +- |
| drivers/s390/char/vmwatchdog.c | 4 +- |
| drivers/s390/char/zcore.c | 2 +- |
| drivers/s390/cio/chsc.c | 15 +- |
| drivers/s390/cio/cio.c | 30 ++-- |
| drivers/s390/cio/cio.h | 1 + |
| drivers/s390/cio/css.c | 16 ++- |
| drivers/s390/cio/css.h | 1 + |
| drivers/s390/cio/device.c | 1 - |
| drivers/s390/cio/device.h | 1 + |
| drivers/s390/cio/device_ops.c | 9 +- |
| drivers/s390/cio/device_status.c | 8 +- |
| drivers/s390/cio/qdio.c | 180 +++++++++--------- |
| drivers/s390/cio/qdio.h | 28 +++ |
| drivers/s390/crypto/ap_bus.c | 16 +- |
| drivers/s390/crypto/zcrypt_api.c | 138 +++++++++++++- |
| drivers/s390/crypto/zcrypt_api.h | 16 ++- |
| drivers/s390/crypto/zcrypt_cca_key.h | 4 +- |
| drivers/s390/crypto/zcrypt_error.h | 2 +- |
| drivers/s390/crypto/zcrypt_pcicc.c | 4 +- |
| drivers/s390/crypto/zcrypt_pcixcc.c | 201 ++++++++++++++++++++- |
| drivers/s390/net/claw.c | 344 +++++++++++++++++----------------- |
| drivers/s390/net/netiucv.c | 97 +++++----- |
| drivers/s390/s390mach.c | 8 +- |
| drivers/s390/s390mach.h | 4 + |
| drivers/s390/scsi/zfcp_def.h | 2 +- |
| drivers/s390/sysinfo.c | 116 ++---------- |
| include/asm-s390/cio.h | 4 + |
| include/asm-s390/cpu.h | 8 + |
| include/asm-s390/debug.h | 5 + |
| include/asm-s390/hardirq.h | 2 +- |
| include/asm-s390/lowcore.h | 6 +- |
| include/asm-s390/smp.h | 3 + |
| include/asm-s390/sysinfo.h | 116 ++++++++++++ |
| include/asm-s390/system.h | 2 + |
| include/asm-s390/timex.h | 13 +- |
| include/asm-s390/tlbflush.h | 36 +++-- |
| include/asm-s390/topology.h | 25 +++ |
| include/linux/interrupt.h | 19 ++ |
| include/linux/irq.h | 10 - |
| kernel/time/tick-broadcast.c | 2 +- |
| kernel/time/tick-common.c | 4 +- |
| kernel/time/tick-oneshot.c | 2 +- |
| 89 files changed, 1949 insertions(+), 927 deletions(-) |
| create mode 100644 arch/s390/kernel/entry.h |
| create mode 100644 arch/s390/kernel/topology.c |
| create mode 100644 include/asm-s390/sysinfo.h |
| Merging sh/master |
| $ git merge sh/master |
| Merge made by recursive. |
| arch/sh/Kconfig | 30 +- |
| arch/sh/Kconfig.debug | 13 +- |
| arch/sh/Makefile | 1 + |
| arch/sh/boards/renesas/migor/setup.c | 197 +++++- |
| arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 39 +- |
| arch/sh/boards/renesas/r7780rp/setup.c | 42 +- |
| arch/sh/boards/se/7721/Makefile | 1 + |
| arch/sh/boards/se/7721/irq.c | 45 ++ |
| arch/sh/boards/se/7721/setup.c | 99 +++ |
| arch/sh/boards/se/7722/setup.c | 41 + |
| arch/sh/configs/se7721_defconfig | 1085 ++++++++++++++++++++++++++ |
| arch/sh/kernel/cf-enabler.c | 15 +- |
| arch/sh/kernel/cpu/sh2a/Makefile | 7 +- |
| arch/sh/kernel/cpu/sh2a/probe.c | 3 + |
| arch/sh/kernel/cpu/sh2a/setup-mxg.c | 168 ++++ |
| arch/sh/kernel/cpu/sh4/probe.c | 33 +- |
| arch/sh/kernel/cpu/sh4a/Makefile | 2 + |
| arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 28 +- |
| arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 300 +++++++ |
| arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 10 +- |
| arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 37 +- |
| arch/sh/kernel/setup.c | 15 + |
| arch/sh/lib/clear_page.S | 6 +- |
| arch/sh/lib/copy_page.S | 6 +- |
| arch/sh/mm/cache-debugfs.c | 4 +- |
| arch/sh/mm/pmb.c | 2 +- |
| arch/sh/tools/mach-types | 5 +- |
| drivers/input/keyboard/Kconfig | 9 + |
| drivers/input/keyboard/Makefile | 1 + |
| drivers/input/keyboard/sh_keysc.c | 280 +++++++ |
| drivers/rtc/rtc-sh.c | 296 +++++--- |
| drivers/serial/sh-sci.c | 7 +- |
| drivers/serial/sh-sci.h | 60 ++- |
| include/asm-sh/bugs.h | 2 +- |
| include/asm-sh/cpu-sh4/freq.h | 6 +- |
| include/asm-sh/cpu-sh4/rtc.h | 5 + |
| include/asm-sh/migor.h | 58 ++ |
| include/asm-sh/processor.h | 5 +- |
| include/asm-sh/r7780rp.h | 22 +- |
| include/asm-sh/se7721.h | 70 ++ |
| include/asm-sh/se7722.h | 2 + |
| include/asm-sh/sh_keysc.h | 13 + |
| include/asm-sh/system.h | 2 + |
| include/asm-sh/uaccess_32.h | 5 +- |
| 44 files changed, 2858 insertions(+), 219 deletions(-) |
| create mode 100644 arch/sh/boards/se/7721/Makefile |
| create mode 100644 arch/sh/boards/se/7721/irq.c |
| create mode 100644 arch/sh/boards/se/7721/setup.c |
| create mode 100644 arch/sh/configs/se7721_defconfig |
| create mode 100644 arch/sh/kernel/cpu/sh2a/setup-mxg.c |
| create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7723.c |
| create mode 100644 drivers/input/keyboard/sh_keysc.c |
| create mode 100644 include/asm-sh/migor.h |
| create mode 100644 include/asm-sh/se7721.h |
| create mode 100644 include/asm-sh/sh_keysc.h |
| Merging jfs/next |
| $ git merge jfs/next |
| Merge made by recursive. |
| fs/jfs/jfs_dmap.c | 11 +++++------ |
| fs/jfs/jfs_dmap.h | 2 +- |
| fs/jfs/jfs_imap.c | 15 ++++++--------- |
| fs/jfs/jfs_xtree.c | 26 ++++++++------------------ |
| 4 files changed, 20 insertions(+), 34 deletions(-) |
| Merging kbuild/master |
| $ git merge kbuild/master |
| Already up-to-date. |
| Merging quilt/ide |
| $ git merge quilt/ide |
| Auto-merged Documentation/ide/ide.txt |
| CONFLICT (content): Merge conflict in Documentation/ide/ide.txt |
| Auto-merged Documentation/kernel-parameters.txt |
| CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt |
| Auto-merged drivers/ide/Kconfig |
| Auto-merged drivers/ide/ide-scan-pci.c |
| Auto-merged drivers/ide/ide.c |
| CONFLICT (content): Merge conflict in drivers/ide/ide.c |
| Auto-merged include/asm-x86/ide.h |
| CONFLICT (content): Merge conflict in include/asm-x86/ide.h |
| Auto-merged include/linux/Kbuild |
| CONFLICT (content): Merge conflict in include/linux/Kbuild |
| Removed include/linux/hdsmart.h |
| Auto-merged include/linux/ide.h |
| Resolved 'Documentation/ide/ide.txt' using previous resolution. |
| Resolved 'Documentation/kernel-parameters.txt' using previous resolution. |
| Resolved 'drivers/ide/ide.c' using previous resolution. |
| Resolved 'include/asm-x86/ide.h' using previous resolution. |
| Resolved 'include/linux/Kbuild' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/ide/ide-tape.txt | 211 ++--- |
| Documentation/ide/ide.txt | 144 +-- |
| Documentation/ide/warm-plug-howto.txt | 13 + |
| Documentation/kernel-parameters.txt | 7 - |
| Documentation/mips/AU1xxx_IDE.README | 46 - |
| arch/powerpc/kernel/setup_32.c | 8 - |
| arch/powerpc/platforms/powermac/pci.c | 22 - |
| arch/powerpc/platforms/powermac/pmac.h | 5 - |
| arch/powerpc/platforms/powermac/setup.c | 8 - |
| arch/ppc/configs/sandpoint_defconfig | 2 +- |
| arch/ppc/kernel/ppc_ksyms.c | 5 - |
| arch/ppc/kernel/setup.c | 2 - |
| arch/ppc/platforms/4xx/bamboo.c | 1 - |
| arch/ppc/platforms/4xx/ebony.c | 1 - |
| arch/ppc/platforms/4xx/luan.c | 1 - |
| arch/ppc/platforms/4xx/ocotea.c | 1 - |
| arch/ppc/platforms/4xx/taishan.c | 1 - |
| arch/ppc/platforms/4xx/yucca.c | 1 - |
| arch/ppc/platforms/chestnut.c | 1 - |
| arch/ppc/platforms/cpci690.c | 1 - |
| arch/ppc/platforms/ev64260.c | 1 - |
| arch/ppc/platforms/hdpu.c | 36 - |
| arch/ppc/platforms/lopec.c | 85 -- |
| arch/ppc/platforms/mvme5100.c | 1 - |
| arch/ppc/platforms/powerpmc250.c | 1 - |
| arch/ppc/platforms/pplus.c | 58 - |
| arch/ppc/platforms/prep_setup.c | 38 - |
| arch/ppc/platforms/prpmc750.c | 1 - |
| arch/ppc/platforms/prpmc800.c | 1 - |
| arch/ppc/platforms/radstone_ppc7d.c | 1 - |
| arch/ppc/platforms/residual.c | 1 - |
| arch/ppc/platforms/sandpoint.c | 94 -- |
| arch/ppc/platforms/sandpoint.h | 3 - |
| arch/ppc/platforms/spruce.c | 1 - |
| arch/ppc/syslib/m8xx_setup.c | 6 - |
| arch/ppc/syslib/ppc4xx_setup.c | 23 - |
| block/compat_ioctl.c | 1 - |
| drivers/ide/Kconfig | 35 +- |
| drivers/ide/Makefile | 2 +- |
| drivers/ide/arm/bast-ide.c | 24 +- |
| drivers/ide/arm/icside.c | 68 +- |
| drivers/ide/arm/ide_arm.c | 20 +- |
| drivers/ide/arm/palm_bk3710.c | 64 +- |
| drivers/ide/arm/rapide.c | 12 +- |
| drivers/ide/cris/ide-cris.c | 115 +- |
| drivers/ide/h8300/ide-h8300.c | 28 +- |
| drivers/ide/ide-acpi.c | 32 +- |
| drivers/ide/ide-cd.c | 937 +++++++--------- |
| drivers/ide/ide-cd.h | 4 - |
| drivers/ide/ide-disk.c | 159 ++-- |
| drivers/ide/ide-dma.c | 155 +--- |
| drivers/ide/ide-floppy.c | 384 +++---- |
| drivers/ide/ide-generic.c | 119 ++- |
| drivers/ide/ide-io.c | 55 +- |
| drivers/ide/ide-iops.c | 262 ++--- |
| drivers/ide/ide-lib.c | 44 +- |
| drivers/ide/ide-pnp.c | 46 +- |
| drivers/ide/ide-probe.c | 401 ++++++-- |
| drivers/ide/ide-proc.c | 188 ++-- |
| drivers/ide/ide-scan-pci.c | 2 +- |
| drivers/ide/ide-tape.c | 1679 ++++++++--------------------- |
| drivers/ide/ide-taskfile.c | 63 +- |
| drivers/ide/ide.c | 1152 +++++--------------- |
| drivers/ide/legacy/Makefile | 1 + |
| drivers/ide/legacy/ali14xx.c | 32 +- |
| drivers/ide/legacy/buddha.c | 19 +- |
| drivers/ide/legacy/dtc2278.c | 27 +- |
| drivers/ide/legacy/falconide.c | 41 +- |
| drivers/ide/legacy/gayle.c | 26 +- |
| drivers/ide/legacy/hd.c | 78 +- |
| drivers/ide/legacy/ht6560b.c | 54 +- |
| drivers/ide/legacy/ide-4drives.c | 72 ++ |
| drivers/ide/legacy/ide-cs.c | 83 +- |
| drivers/ide/legacy/ide_platform.c | 14 +- |
| drivers/ide/legacy/macide.c | 9 +- |
| drivers/ide/legacy/q40ide.c | 34 +- |
| drivers/ide/legacy/qd65xx.c | 223 ++--- |
| drivers/ide/legacy/qd65xx.h | 1 - |
| drivers/ide/legacy/umc8672.c | 80 +- |
| drivers/ide/mips/au1xxx-ide.c | 146 +-- |
| drivers/ide/mips/swarm.c | 20 +- |
| drivers/ide/pci/aec62xx.c | 39 +- |
| drivers/ide/pci/alim15x3.c | 332 +----- |
| drivers/ide/pci/amd74xx.c | 19 +- |
| drivers/ide/pci/atiixp.c | 29 +- |
| drivers/ide/pci/cmd640.c | 316 +++--- |
| drivers/ide/pci/cmd64x.c | 153 ++-- |
| drivers/ide/pci/cs5520.c | 29 +- |
| drivers/ide/pci/cs5530.c | 18 +- |
| drivers/ide/pci/cs5535.c | 24 +- |
| drivers/ide/pci/cy82c693.c | 97 +- |
| drivers/ide/pci/delkin_cb.c | 19 +- |
| drivers/ide/pci/generic.c | 10 +- |
| drivers/ide/pci/hpt34x.c | 17 +- |
| drivers/ide/pci/hpt366.c | 187 ++-- |
| drivers/ide/pci/it8213.c | 34 +- |
| drivers/ide/pci/it821x.c | 52 +- |
| drivers/ide/pci/jmicron.c | 29 +- |
| drivers/ide/pci/ns87415.c | 44 +- |
| drivers/ide/pci/opti621.c | 82 +- |
| drivers/ide/pci/pdc202xx_new.c | 23 +- |
| drivers/ide/pci/pdc202xx_old.c | 126 +-- |
| drivers/ide/pci/piix.c | 17 +- |
| drivers/ide/pci/rz1000.c | 2 +- |
| drivers/ide/pci/sc1200.c | 39 +- |
| drivers/ide/pci/scc_pata.c | 138 ++- |
| drivers/ide/pci/serverworks.c | 38 +- |
| drivers/ide/pci/sgiioc4.c | 153 ++-- |
| drivers/ide/pci/siimage.c | 508 ++++----- |
| drivers/ide/pci/sis5513.c | 253 +++--- |
| drivers/ide/pci/sl82c105.c | 87 +- |
| drivers/ide/pci/slc90e66.c | 22 +- |
| drivers/ide/pci/tc86c001.c | 90 +- |
| drivers/ide/pci/triflex.c | 12 +- |
| drivers/ide/pci/trm290.c | 47 +- |
| drivers/ide/pci/via82cxxx.c | 20 +- |
| drivers/ide/ppc/mpc8xx.c | 142 ++-- |
| drivers/ide/ppc/pmac.c | 282 +++--- |
| drivers/ide/setup-pci.c | 227 ++--- |
| drivers/macintosh/mediabay.c | 17 +- |
| drivers/scsi/ide-scsi.c | 229 ++--- |
| include/asm-alpha/ide.h | 11 - |
| include/asm-arm/arch-sa1100/ide.h | 6 +- |
| include/asm-arm/ide.h | 8 - |
| include/asm-blackfin/ide.h | 4 - |
| include/asm-cris/arch-v10/ide.h | 11 +- |
| include/asm-ia64/ide.h | 10 - |
| include/asm-m32r/ide.h | 10 - |
| include/asm-mips/mach-au1x00/au1xxx_ide.h | 42 - |
| include/asm-mips/mach-generic/ide.h | 10 - |
| include/asm-parisc/ide.h | 2 - |
| include/asm-powerpc/ide.h | 57 +- |
| include/asm-powerpc/mediabay.h | 6 +- |
| include/asm-sh/ide.h | 3 - |
| include/asm-sparc/ide.h | 2 - |
| include/asm-sparc64/ide.h | 2 - |
| include/asm-x86/ide.h | 10 - |
| include/linux/Kbuild | 1 - |
| include/linux/hdreg.h | 4 +- |
| include/linux/hdsmart.h | 126 --- |
| include/linux/ide.h | 411 ++++---- |
| 141 files changed, 4967 insertions(+), 7614 deletions(-) |
| create mode 100644 Documentation/ide/warm-plug-howto.txt |
| create mode 100644 drivers/ide/legacy/ide-4drives.c |
| delete mode 100644 include/linux/hdsmart.h |
| Merging libata/NEXT |
| $ git merge libata/NEXT |
| Auto-merged drivers/ata/ahci.c |
| Auto-merged drivers/ata/libata-scsi.c |
| Auto-merged drivers/scsi/ipr.c |
| Auto-merged include/linux/libata.h |
| Merge made by recursive. |
| drivers/ata/Kconfig | 52 +- |
| drivers/ata/Makefile | 5 +- |
| drivers/ata/ahci.c | 303 ++---- |
| drivers/ata/ata_generic.c | 51 +- |
| drivers/ata/ata_piix.c | 312 ++----- |
| drivers/ata/libata-acpi.c | 2 +- |
| drivers/ata/libata-core.c | 2197 +++++-------------------------------- |
| drivers/ata/libata-eh.c | 199 ++-- |
| drivers/ata/libata-pmp.c | 247 +---- |
| drivers/ata/libata-scsi.c | 17 +- |
| drivers/ata/libata-sff.c | 2302 +++++++++++++++++++++++++++++++++++---- |
| drivers/ata/libata.h | 53 +- |
| drivers/ata/pata_acpi.c | 83 +-- |
| drivers/ata/pata_ali.c | 165 +--- |
| drivers/ata/pata_amd.c | 268 +---- |
| drivers/ata/pata_artop.c | 125 +-- |
| drivers/ata/pata_at32.c | 46 +- |
| drivers/ata/pata_atiixp.c | 57 +- |
| drivers/ata/pata_bf54x.c | 131 +-- |
| drivers/ata/pata_cmd640.c | 83 +- |
| drivers/ata/pata_cmd64x.c | 137 +-- |
| drivers/ata/pata_cs5520.c | 64 +- |
| drivers/ata/pata_cs5530.c | 80 +- |
| drivers/ata/pata_cs5535.c | 50 +- |
| drivers/ata/pata_cs5536.c | 50 +- |
| drivers/ata/pata_cypress.c | 50 +- |
| drivers/ata/pata_efar.c | 66 +- |
| drivers/ata/pata_hpt366.c | 77 +- |
| drivers/ata/pata_hpt37x.c | 245 +---- |
| drivers/ata/pata_hpt3x2n.c | 85 +-- |
| drivers/ata/pata_hpt3x3.c | 56 +- |
| drivers/ata/pata_icside.c | 67 +- |
| drivers/ata/pata_isapnp.c | 41 +- |
| drivers/ata/pata_it8213.c | 67 +- |
| drivers/ata/pata_it821x.c | 109 +-- |
| drivers/ata/pata_ixp4xx_cf.c | 46 +- |
| drivers/ata/pata_jmicron.c | 68 +-- |
| drivers/ata/pata_legacy.c | 316 +----- |
| drivers/ata/pata_marvell.c | 69 +-- |
| drivers/ata/pata_mpc52xx.c | 48 +- |
| drivers/ata/pata_mpiix.c | 71 +- |
| drivers/ata/pata_netcell.c | 58 +- |
| drivers/ata/pata_ninja32.c | 54 +- |
| drivers/ata/pata_ns87410.c | 68 +- |
| drivers/ata/pata_ns87415.c | 102 +-- |
| drivers/ata/pata_oldpiix.c | 74 +-- |
| drivers/ata/pata_opti.c | 66 +- |
| drivers/ata/pata_optidma.c | 103 +-- |
| drivers/ata/pata_pcmcia.c | 68 +- |
| drivers/ata/pata_pdc2027x.c | 99 +-- |
| drivers/ata/pata_pdc202xx_old.c | 96 +-- |
| drivers/ata/pata_platform.c | 46 +- |
| drivers/ata/pata_qdi.c | 77 +-- |
| drivers/ata/pata_radisys.c | 57 +- |
| drivers/ata/pata_rb500_cf.c | 54 +- |
| drivers/ata/pata_rz1000.c | 49 +- |
| drivers/ata/pata_sc1200.c | 59 +- |
| drivers/ata/pata_scc.c | 251 ++--- |
| drivers/ata/pata_serverworks.c | 114 +-- |
| drivers/ata/pata_sil680.c | 71 +- |
| drivers/ata/pata_sis.c | 230 +---- |
| drivers/ata/pata_sl82c105.c | 67 +- |
| drivers/ata/pata_triflex.c | 58 +- |
| drivers/ata/pata_via.c | 134 +-- |
| drivers/ata/pata_winbond.c | 47 +- |
| drivers/ata/pdc_adma.c | 80 +-- |
| drivers/ata/sata_fsl.c | 126 +-- |
| drivers/ata/sata_inic162x.c | 71 +- |
| drivers/ata/sata_mv.c | 377 +++---- |
| drivers/ata/sata_nv.c | 263 ++---- |
| drivers/ata/sata_promise.c | 118 +-- |
| drivers/ata/sata_qstor.c | 56 +- |
| drivers/ata/sata_sil.c | 55 +- |
| drivers/ata/sata_sil24.c | 237 ++--- |
| drivers/ata/sata_sis.c | 44 +- |
| drivers/ata/sata_svw.c | 47 +- |
| drivers/ata/sata_sx4.c | 52 +- |
| drivers/ata/sata_uli.c | 55 +- |
| drivers/ata/sata_via.c | 126 +-- |
| drivers/ata/sata_vsc.c | 44 +- |
| drivers/scsi/ipr.c | 74 +- |
| drivers/scsi/libsas/sas_ata.c | 19 +- |
| include/linux/libata.h | 718 ++++++++----- |
| 83 files changed, 4624 insertions(+), 8600 deletions(-) |
| Merging nfs/linux-next |
| $ git merge nfs/linux-next |
| Auto-merged fs/nfs/file.c |
| Auto-merged fs/nfs/inode.c |
| Auto-merged fs/nfs/super.c |
| Auto-merged net/sunrpc/clnt.c |
| Merge made by recursive. |
| fs/Kconfig | 70 +++++------ |
| fs/lockd/host.c | 20 ++-- |
| fs/lockd/mon.c | 113 +++++++++++++---- |
| fs/lockd/svc.c | 12 ++ |
| fs/nfs/Makefile | 3 +- |
| fs/nfs/client.c | 16 +++ |
| fs/nfs/dir.c | 2 +- |
| fs/nfs/direct.c | 9 +- |
| fs/nfs/file.c | 6 - |
| fs/nfs/inode.c | 45 +++++++- |
| fs/nfs/internal.h | 13 +-- |
| fs/nfs/nfs2xdr.c | 37 +++++-- |
| fs/nfs/nfs3xdr.c | 37 +++++-- |
| fs/nfs/nfs4proc.c | 18 ++- |
| fs/nfs/nfs4state.c | 8 +- |
| fs/nfs/nfs4xdr.c | 39 +++++-- |
| fs/nfs/read.c | 18 +-- |
| fs/nfs/super.c | 130 +++++++++++++------- |
| fs/nfs/unlink.c | 2 +- |
| fs/nfs/write.c | 86 +++++++------ |
| include/linux/lockd/lockd.h | 17 ++-- |
| include/linux/lockd/sm_inter.h | 1 + |
| include/linux/nfs_fs_sb.h | 8 ++ |
| include/linux/sunrpc/auth.h | 13 ++- |
| include/linux/sunrpc/clnt.h | 9 +- |
| include/linux/sunrpc/sched.h | 41 +++---- |
| net/sunrpc/Makefile | 2 +- |
| net/sunrpc/auth.c | 63 ++++++---- |
| net/sunrpc/auth_generic.c | 157 ++++++++++++++++++++++++ |
| net/sunrpc/auth_gss/auth_gss.c | 7 +- |
| net/sunrpc/auth_null.c | 1 + |
| net/sunrpc/auth_unix.c | 57 ++++----- |
| net/sunrpc/clnt.c | 8 +- |
| net/sunrpc/rpcb_clnt.c | 2 +- |
| net/sunrpc/sched.c | 264 ++++++++++++++++++---------------------- |
| net/sunrpc/xprt.c | 45 ++++--- |
| net/sunrpc/xprtsock.c | 7 +- |
| 37 files changed, 888 insertions(+), 498 deletions(-) |
| create mode 100644 net/sunrpc/auth_generic.c |
| Merging xfs/master |
| $ git merge xfs/master |
| Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c |
| CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c |
| Auto-merged fs/xfs/quota/xfs_qm.c |
| Auto-merged fs/xfs/quota/xfs_qm_syscalls.c |
| CONFLICT (content): Merge conflict in fs/xfs/quota/xfs_qm_syscalls.c |
| Auto-merged fs/xfs/xfs_bmap.c |
| Auto-merged fs/xfs/xfs_dir2.c |
| Auto-merged fs/xfs/xfs_ialloc.c |
| CONFLICT (content): Merge conflict in fs/xfs/xfs_ialloc.c |
| Auto-merged fs/xfs/xfs_inode.c |
| Auto-merged fs/xfs/xfs_inode_item.c |
| Auto-merged fs/xfs/xfs_itable.c |
| Auto-merged fs/xfs/xfs_log.c |
| Auto-merged fs/xfs/xfs_log_priv.h |
| Auto-merged fs/xfs/xfs_log_recover.c |
| Auto-merged fs/xfs/xfs_mount.c |
| CONFLICT (content): Merge conflict in fs/xfs/xfs_mount.c |
| Auto-merged fs/xfs/xfs_utils.c |
| Auto-merged fs/xfs/xfs_vfsops.c |
| Auto-merged fs/xfs/xfs_vnodeops.c |
| Recorded preimage for 'fs/xfs/linux-2.6/xfs_ioctl.c' |
| Recorded preimage for 'fs/xfs/quota/xfs_qm_syscalls.c' |
| Recorded preimage for 'fs/xfs/xfs_mount.c' |
| Resolved 'fs/xfs/xfs_ialloc.c' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| fs/xfs/linux-2.6/kmem.c | 6 +- |
| fs/xfs/linux-2.6/xfs_aops.c | 12 +- |
| fs/xfs/linux-2.6/xfs_buf.c | 8 +- |
| fs/xfs/linux-2.6/xfs_buf.h | 8 +- |
| fs/xfs/linux-2.6/xfs_cred.h | 2 +- |
| fs/xfs/linux-2.6/xfs_export.c | 14 +- |
| 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 | 676 +++++++++++++++++-------------------- |
| fs/xfs/linux-2.6/xfs_iops.c | 223 +++++++------ |
| fs/xfs/linux-2.6/xfs_linux.h | 1 - |
| fs/xfs/linux-2.6/xfs_lrw.c | 72 ++--- |
| fs/xfs/linux-2.6/xfs_lrw.h | 3 +- |
| fs/xfs/linux-2.6/xfs_stats.h | 4 +- |
| fs/xfs/linux-2.6/xfs_super.c | 24 +- |
| fs/xfs/linux-2.6/xfs_vnode.h | 30 +-- |
| fs/xfs/quota/xfs_dquot.c | 20 +- |
| fs/xfs/quota/xfs_dquot_item.c | 14 +- |
| fs/xfs/quota/xfs_qm.c | 76 +++-- |
| fs/xfs/quota/xfs_qm.h | 2 +- |
| fs/xfs/quota/xfs_qm_stats.h | 4 +- |
| fs/xfs/quota/xfs_qm_syscalls.c | 44 ++- |
| fs/xfs/support/ktrace.c | 37 +- |
| fs/xfs/support/ktrace.h | 3 +- |
| fs/xfs/xfs_acl.c | 16 +- |
| fs/xfs/xfs_alloc.c | 65 ++-- |
| fs/xfs/xfs_bmap.c | 44 ++-- |
| fs/xfs/xfs_bmap.h | 2 +- |
| fs/xfs/xfs_bmap_btree.c | 54 +++- |
| fs/xfs/xfs_buf_item.c | 7 +- |
| fs/xfs/xfs_dir2.c | 62 ++-- |
| fs/xfs/xfs_dir2.h | 12 +- |
| fs/xfs/xfs_filestream.c | 2 +- |
| fs/xfs/xfs_ialloc.c | 44 ++- |
| fs/xfs/xfs_iget.c | 49 +--- |
| fs/xfs/xfs_inode.c | 730 ++++++++++++++++++++-------------------- |
| fs/xfs/xfs_inode.h | 23 +-- |
| fs/xfs/xfs_inode_item.c | 8 +- |
| fs/xfs/xfs_inode_item.h | 8 + |
| fs/xfs/xfs_iomap.c | 7 +- |
| fs/xfs/xfs_itable.c | 7 +- |
| fs/xfs/xfs_log.c | 259 +++++---------- |
| fs/xfs/xfs_log.h | 5 +- |
| fs/xfs/xfs_log_priv.h | 93 +++-- |
| fs/xfs/xfs_log_recover.c | 123 +++++-- |
| fs/xfs/xfs_mount.c | 66 ++-- |
| fs/xfs/xfs_mount.h | 30 +- |
| fs/xfs/xfs_rename.c | 121 +++----- |
| fs/xfs/xfs_rtalloc.c | 41 ++- |
| fs/xfs/xfs_rw.c | 8 +- |
| fs/xfs/xfs_trans.h | 8 +- |
| fs/xfs/xfs_trans_ail.c | 151 ++++----- |
| fs/xfs/xfs_trans_buf.c | 15 +- |
| fs/xfs/xfs_types.h | 5 + |
| fs/xfs/xfs_utils.c | 26 +-- |
| fs/xfs/xfs_utils.h | 15 +- |
| fs/xfs/xfs_vfsops.c | 73 ++--- |
| fs/xfs/xfs_vnodeops.c | 505 +++++++++------------------- |
| fs/xfs/xfs_vnodeops.h | 33 +- |
| 59 files changed, 1847 insertions(+), 2202 deletions(-) |
| Merging infiniband/for-next |
| $ git merge infiniband/for-next |
| Auto-merged drivers/infiniband/core/uverbs.h |
| Auto-merged drivers/infiniband/core/uverbs_main.c |
| Auto-merged drivers/infiniband/hw/amso1100/c2_provider.c |
| CONFLICT (content): Merge conflict in drivers/infiniband/hw/amso1100/c2_provider.c |
| Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c |
| CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb3/iwch_provider.c |
| Auto-merged drivers/infiniband/hw/ipath/ipath_diag.c |
| Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c |
| Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h |
| Auto-merged drivers/infiniband/hw/ipath/ipath_verbs.c |
| Auto-merged drivers/infiniband/hw/mlx4/main.c |
| Auto-merged drivers/infiniband/hw/mthca/mthca_provider.c |
| Auto-merged drivers/infiniband/hw/nes/nes_verbs.c |
| CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c |
| Auto-merged drivers/infiniband/ulp/srp/ib_srp.c |
| Auto-merged include/rdma/ib_verbs.h |
| Resolved 'drivers/infiniband/hw/amso1100/c2_provider.c' using previous resolution. |
| Resolved 'drivers/infiniband/hw/cxgb3/iwch_provider.c' using previous resolution. |
| Resolved 'drivers/infiniband/hw/nes/nes_verbs.c' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| drivers/infiniband/core/cm.c | 63 +- |
| drivers/infiniband/core/cma.c | 2 +- |
| drivers/infiniband/core/fmr_pool.c | 3 +- |
| drivers/infiniband/core/ucma.c | 2 +- |
| drivers/infiniband/core/uverbs.h | 4 +- |
| drivers/infiniband/core/uverbs_cmd.c | 14 +- |
| drivers/infiniband/core/uverbs_main.c | 28 +- |
| drivers/infiniband/core/verbs.c | 14 +- |
| drivers/infiniband/hw/amso1100/c2.c | 80 +- |
| drivers/infiniband/hw/amso1100/c2.h | 16 +- |
| drivers/infiniband/hw/amso1100/c2_ae.c | 10 +- |
| drivers/infiniband/hw/amso1100/c2_alloc.c | 12 +- |
| drivers/infiniband/hw/amso1100/c2_cq.c | 4 +- |
| drivers/infiniband/hw/amso1100/c2_intr.c | 6 +- |
| 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_provider.c | 85 +- |
| drivers/infiniband/hw/amso1100/c2_qp.c | 30 +- |
| drivers/infiniband/hw/amso1100/c2_rnic.c | 31 +- |
| drivers/infiniband/hw/amso1100/c2_vq.c | 2 +- |
| drivers/infiniband/hw/amso1100/c2_wr.h | 212 +- |
| drivers/infiniband/hw/cxgb3/cxio_dbg.c | 24 +- |
| drivers/infiniband/hw/cxgb3/cxio_hal.c | 84 +- |
| drivers/infiniband/hw/cxgb3/cxio_resource.c | 12 +- |
| drivers/infiniband/hw/cxgb3/iwch.c | 6 +- |
| drivers/infiniband/hw/cxgb3/iwch.h | 2 +- |
| drivers/infiniband/hw/cxgb3/iwch_cm.c | 166 +- |
| drivers/infiniband/hw/cxgb3/iwch_cm.h | 4 +- |
| drivers/infiniband/hw/cxgb3/iwch_cq.c | 4 +- |
| drivers/infiniband/hw/cxgb3/iwch_ev.c | 12 +- |
| drivers/infiniband/hw/cxgb3/iwch_mem.c | 6 +- |
| drivers/infiniband/hw/cxgb3/iwch_provider.c | 81 +- |
| drivers/infiniband/hw/cxgb3/iwch_provider.h | 4 +- |
| drivers/infiniband/hw/cxgb3/iwch_qp.c | 42 +- |
| drivers/infiniband/hw/ehca/ehca_av.c | 31 - |
| drivers/infiniband/hw/ehca/ehca_classes.h | 2 - |
| drivers/infiniband/hw/ehca/ehca_cq.c | 19 - |
| drivers/infiniband/hw/ehca/ehca_hca.c | 2 +- |
| drivers/infiniband/hw/ehca/ehca_main.c | 19 +- |
| drivers/infiniband/hw/ehca/ehca_mrmw.c | 42 +- |
| drivers/infiniband/hw/ehca/ehca_pd.c | 11 - |
| drivers/infiniband/hw/ehca/ehca_qp.c | 51 +- |
| drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +- |
| drivers/infiniband/hw/ehca/ehca_tools.h | 16 +- |
| drivers/infiniband/hw/ehca/ehca_uverbs.c | 19 - |
| drivers/infiniband/hw/ipath/Makefile | 3 + |
| drivers/infiniband/hw/ipath/ipath_7220.h | 57 + |
| drivers/infiniband/hw/ipath/ipath_common.h | 54 +- |
| drivers/infiniband/hw/ipath/ipath_debug.h | 2 + |
| drivers/infiniband/hw/ipath/ipath_diag.c | 35 +- |
| drivers/infiniband/hw/ipath/ipath_driver.c | 1041 +++++++--- |
| drivers/infiniband/hw/ipath/ipath_eeprom.c | 428 ++++- |
| drivers/infiniband/hw/ipath/ipath_file_ops.c | 176 ++- |
| drivers/infiniband/hw/ipath/ipath_iba6110.c | 51 +- |
| drivers/infiniband/hw/ipath/ipath_iba6120.c | 203 ++- |
| drivers/infiniband/hw/ipath/ipath_iba7220.c | 2571 ++++++++++++++++++++++++ |
| drivers/infiniband/hw/ipath/ipath_init_chip.c | 312 ++-- |
| drivers/infiniband/hw/ipath/ipath_intr.c | 656 ++++--- |
| drivers/infiniband/hw/ipath/ipath_kernel.h | 304 +++- |
| drivers/infiniband/hw/ipath/ipath_mad.c | 110 +- |
| drivers/infiniband/hw/ipath/ipath_qp.c | 59 +- |
| drivers/infiniband/hw/ipath/ipath_rc.c | 67 +- |
| drivers/infiniband/hw/ipath/ipath_registers.h | 168 +- |
| drivers/infiniband/hw/ipath/ipath_ruc.c | 22 +- |
| drivers/infiniband/hw/ipath/ipath_sd7220.c | 1462 ++++++++++++++ |
| drivers/infiniband/hw/ipath/ipath_sd7220_img.c | 1082 ++++++++++ |
| drivers/infiniband/hw/ipath/ipath_sdma.c | 790 ++++++++ |
| drivers/infiniband/hw/ipath/ipath_srq.c | 5 +- |
| drivers/infiniband/hw/ipath/ipath_stats.c | 33 +- |
| drivers/infiniband/hw/ipath/ipath_sysfs.c | 104 +- |
| drivers/infiniband/hw/ipath/ipath_uc.c | 8 +- |
| drivers/infiniband/hw/ipath/ipath_ud.c | 7 +- |
| drivers/infiniband/hw/ipath/ipath_user_sdma.c | 879 ++++++++ |
| drivers/infiniband/hw/ipath/ipath_user_sdma.h | 54 + |
| drivers/infiniband/hw/ipath/ipath_verbs.c | 413 ++++- |
| drivers/infiniband/hw/ipath/ipath_verbs.h | 32 +- |
| drivers/infiniband/hw/mlx4/cq.c | 319 +++- |
| drivers/infiniband/hw/mlx4/mad.c | 2 +- |
| drivers/infiniband/hw/mlx4/main.c | 25 +- |
| drivers/infiniband/hw/mlx4/mlx4_ib.h | 15 + |
| drivers/infiniband/hw/mlx4/qp.c | 117 +- |
| drivers/infiniband/hw/mthca/mthca_cmd.c | 6 +- |
| drivers/infiniband/hw/mthca/mthca_cmd.h | 1 + |
| drivers/infiniband/hw/mthca/mthca_cq.c | 14 +- |
| drivers/infiniband/hw/mthca/mthca_dev.h | 14 +- |
| drivers/infiniband/hw/mthca/mthca_eq.c | 4 +- |
| drivers/infiniband/hw/mthca/mthca_mad.c | 2 +- |
| drivers/infiniband/hw/mthca/mthca_main.c | 15 +- |
| drivers/infiniband/hw/mthca/mthca_memfree.c | 6 +- |
| drivers/infiniband/hw/mthca/mthca_profile.c | 4 +- |
| drivers/infiniband/hw/mthca/mthca_profile.h | 2 +- |
| drivers/infiniband/hw/mthca/mthca_provider.c | 5 +- |
| drivers/infiniband/hw/mthca/mthca_qp.c | 28 +- |
| drivers/infiniband/hw/mthca/mthca_wqe.h | 16 +- |
| drivers/infiniband/hw/nes/nes.c | 11 +- |
| drivers/infiniband/hw/nes/nes.h | 32 +- |
| drivers/infiniband/hw/nes/nes_cm.c | 131 +- |
| drivers/infiniband/hw/nes/nes_cm.h | 35 - |
| drivers/infiniband/hw/nes/nes_hw.c | 49 +- |
| drivers/infiniband/hw/nes/nes_nic.c | 26 +- |
| drivers/infiniband/hw/nes/nes_utils.c | 2 +- |
| drivers/infiniband/hw/nes/nes_verbs.c | 29 +- |
| drivers/infiniband/ulp/ipoib/Makefile | 3 +- |
| drivers/infiniband/ulp/ipoib/ipoib.h | 10 + |
| drivers/infiniband/ulp/ipoib/ipoib_cm.c | 11 + |
| drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 99 + |
| drivers/infiniband/ulp/ipoib/ipoib_ib.c | 116 +- |
| drivers/infiniband/ulp/ipoib/ipoib_main.c | 33 +- |
| drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 + |
| drivers/infiniband/ulp/srp/ib_srp.c | 7 +- |
| drivers/net/mlx4/catas.c | 2 +- |
| drivers/net/mlx4/cmd.c | 3 +- |
| drivers/net/mlx4/cq.c | 72 +- |
| drivers/net/mlx4/eq.c | 5 +- |
| drivers/net/mlx4/fw.c | 13 + |
| drivers/net/mlx4/fw.h | 1 + |
| drivers/net/mlx4/intf.c | 8 +- |
| drivers/net/mlx4/main.c | 3 +- |
| drivers/net/mlx4/mlx4.h | 4 +- |
| include/linux/mlx4/cmd.h | 2 +- |
| include/linux/mlx4/cq.h | 19 +- |
| include/linux/mlx4/device.h | 1 + |
| include/linux/mlx4/driver.h | 3 +- |
| include/linux/mlx4/qp.h | 15 +- |
| include/rdma/ib_user_verbs.h | 5 +- |
| include/rdma/ib_verbs.h | 35 +- |
| net/sunrpc/xprtrdma/verbs.c | 1 - |
| 128 files changed, 11646 insertions(+), 2213 deletions(-) |
| create mode 100644 drivers/infiniband/hw/ipath/ipath_7220.h |
| create mode 100644 drivers/infiniband/hw/ipath/ipath_iba7220.c |
| create mode 100644 drivers/infiniband/hw/ipath/ipath_sd7220.c |
| create mode 100644 drivers/infiniband/hw/ipath/ipath_sd7220_img.c |
| create mode 100644 drivers/infiniband/hw/ipath/ipath_sdma.c |
| create mode 100644 drivers/infiniband/hw/ipath/ipath_user_sdma.c |
| create mode 100644 drivers/infiniband/hw/ipath/ipath_user_sdma.h |
| create mode 100644 drivers/infiniband/ulp/ipoib/ipoib_ethtool.c |
| Applying infiniband-fix-2 |
| Merging acpi/test |
| $ git merge acpi/test |
| Auto-merged Documentation/kernel-parameters.txt |
| Auto-merged arch/x86/Kconfig |
| Auto-merged arch/x86/boot/Makefile |
| Removed arch/x86/kernel/acpi/sleep_32.c |
| Auto-merged arch/x86/kernel/apm_32.c |
| Auto-merged arch/x86/kernel/e820_64.c |
| Auto-merged arch/x86/kernel/head_64.S |
| Auto-merged arch/x86/kernel/setup_32.c |
| Auto-merged arch/x86/kernel/setup_64.c |
| CONFLICT (content): Merge conflict in arch/x86/kernel/setup_64.c |
| CONFLICT (delete/modify): arch/x86/kernel/smpboot_64.c deleted in HEAD and modified in acpi/test. Version acpi/test of arch/x86/kernel/smpboot_64.c left in tree. |
| CONFLICT (delete/modify): include/asm-x86/smp_64.h deleted in HEAD and modified in acpi/test. Version acpi/test of include/asm-x86/smp_64.h left in tree. |
| Removed kernel/power/pm.c |
| Resolved 'arch/x86/kernel/setup_64.c' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git rm arch/x86/kernel/smpboot_64.c include/asm-x86/smp_64.h |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| arch/frv/kernel/pm.c | 8 - |
| arch/mips/au1000/common/power.c | 35 +--- |
| arch/x86/Kconfig | 2 +- |
| arch/x86/boot/Makefile | 2 +- |
| arch/x86/boot/boot.h | 5 + |
| arch/x86/boot/video-bios.c | 6 + |
| arch/x86/boot/video-mode.c | 173 ++++++++++++ |
| arch/x86/boot/video-vesa.c | 8 + |
| arch/x86/boot/video-vga.c | 12 +- |
| arch/x86/boot/video.c | 157 +----------- |
| arch/x86/kernel/acpi/Makefile | 8 +- |
| arch/x86/kernel/acpi/realmode/Makefile | 57 ++++ |
| arch/x86/kernel/acpi/realmode/copy.S | 1 + |
| arch/x86/kernel/acpi/realmode/video-bios.c | 1 + |
| arch/x86/kernel/acpi/realmode/video-mode.c | 1 + |
| arch/x86/kernel/acpi/realmode/video-vesa.c | 1 + |
| arch/x86/kernel/acpi/realmode/video-vga.c | 1 + |
| arch/x86/kernel/acpi/realmode/wakemain.c | 81 ++++++ |
| arch/x86/kernel/acpi/realmode/wakeup.S | 113 ++++++++ |
| arch/x86/kernel/acpi/realmode/wakeup.h | 36 +++ |
| arch/x86/kernel/acpi/realmode/wakeup.lds.S | 61 ++++ |
| arch/x86/kernel/acpi/sleep.c | 73 ++++- |
| arch/x86/kernel/acpi/sleep.h | 18 ++ |
| arch/x86/kernel/acpi/sleep_32.c | 40 --- |
| arch/x86/kernel/acpi/wakeup_32.S | 247 ++--------------- |
| arch/x86/kernel/acpi/wakeup_64.S | 313 +-------------------- |
| arch/x86/kernel/acpi/wakeup_rm.S | 10 + |
| arch/x86/kernel/apm_32.c | 16 - |
| arch/x86/kernel/e820_64.c | 5 +- |
| arch/x86/kernel/head_64.S | 4 - |
| arch/x86/kernel/setup_32.c | 4 +- |
| arch/x86/kernel/setup_64.c | 16 + |
| drivers/acpi/ec.c | 240 +++++++++-------- |
| drivers/acpi/events/evgpe.c | 3 +- |
| drivers/acpi/glue.c | 20 ++ |
| drivers/acpi/utilities/utxface.c | 36 ++-- |
| drivers/pnp/base.h | 43 +++ |
| drivers/pnp/card.c | 57 ++++- |
| drivers/pnp/core.c | 36 +++- |
| drivers/pnp/driver.c | 28 ++- |
| drivers/pnp/interface.c | 105 +++----- |
| drivers/pnp/isapnp/core.c | 198 ++++++-------- |
| drivers/pnp/manager.c | 128 +++------ |
| drivers/pnp/pnpacpi/core.c | 85 +----- |
| drivers/pnp/pnpacpi/pnpacpi.h | 8 +- |
| drivers/pnp/pnpacpi/rsparser.c | 414 ++++++++++++---------------- |
| drivers/pnp/pnpbios/core.c | 31 +-- |
| drivers/pnp/pnpbios/pnpbios.h | 4 +- |
| drivers/pnp/pnpbios/rsparser.c | 188 ++++--------- |
| drivers/pnp/quirks.c | 15 +- |
| drivers/pnp/resource.c | 274 ++++++++++++++---- |
| drivers/pnp/system.c | 21 +- |
| drivers/rtc/rtc-cmos.c | 7 +- |
| include/asm-x86/trampoline.h | 18 ++ |
| include/linux/isapnp.h | 10 - |
| include/linux/pnp.h | 147 +++++------ |
| kernel/power/Kconfig | 10 - |
| kernel/power/Makefile | 1 - |
| kernel/power/pm.c | 205 -------------- |
| 59 files changed, 1751 insertions(+), 2096 deletions(-) |
| create mode 100644 arch/x86/boot/video-mode.c |
| create mode 100644 arch/x86/kernel/acpi/realmode/Makefile |
| create mode 100644 arch/x86/kernel/acpi/realmode/copy.S |
| create mode 100644 arch/x86/kernel/acpi/realmode/video-bios.c |
| create mode 100644 arch/x86/kernel/acpi/realmode/video-mode.c |
| create mode 100644 arch/x86/kernel/acpi/realmode/video-vesa.c |
| create mode 100644 arch/x86/kernel/acpi/realmode/video-vga.c |
| create mode 100644 arch/x86/kernel/acpi/realmode/wakemain.c |
| create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.S |
| create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.h |
| create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.lds.S |
| create mode 100644 arch/x86/kernel/acpi/sleep.h |
| delete mode 100644 arch/x86/kernel/acpi/sleep_32.c |
| create mode 100644 arch/x86/kernel/acpi/wakeup_rm.S |
| create mode 100644 include/asm-x86/trampoline.h |
| delete mode 100644 kernel/power/pm.c |
| Applying acpi-fix-1 |
| Applying acpi-fix-2 |
| Merging blackfin/for-linus |
| $ git merge blackfin/for-linus |
| Already up-to-date. |
| Merging nfsd/nfsd-next |
| $ git merge nfsd/nfsd-next |
| Auto-merged fs/Kconfig |
| Auto-merged fs/lockd/host.c |
| Auto-merged fs/lockd/svc.c |
| Merge made by recursive. |
| Documentation/filesystems/nfs-rdma.txt | 252 ++++++++++++++++++++++++++++++ |
| fs/Kconfig | 109 +++++++------ |
| fs/lockd/host.c | 73 +++++----- |
| fs/lockd/svc.c | 150 ++++++++---------- |
| fs/lockd/svclock.c | 6 +- |
| fs/lockd/svcshare.c | 3 +- |
| fs/nfs/callback.c | 93 ++++++------ |
| fs/nfs/symlink.c | 1 - |
| fs/nfsd/auth.c | 1 + |
| fs/nfsd/export.c | 9 +- |
| fs/nfsd/nfs4callback.c | 28 ++-- |
| fs/nfsd/nfs4idmap.c | 2 +- |
| fs/nfsd/nfs4state.c | 71 +++++---- |
| fs/nfsd/nfs4xdr.c | 13 ++- |
| fs/nfsd/nfsctl.c | 22 ++- |
| fs/nfsd/nfsfh.c | 228 +++++++++++++++------------- |
| fs/nfsd/nfssvc.c | 2 - |
| fs/nfsd/vfs.c | 4 +- |
| include/linux/exportfs.h | 2 +- |
| include/linux/nfs3.h | 2 +- |
| include/linux/nfsd/Kbuild | 4 +- |
| include/linux/nfsd/cache.h | 2 - |
| include/linux/nfsd/nfsd.h | 11 +- |
| include/linux/sunrpc/cache.h | 1 - |
| include/linux/sunrpc/gss_krb5.h | 6 +- |
| include/linux/sunrpc/svc.h | 1 - |
| include/linux/sunrpc/svcauth.h | 5 +- |
| include/net/ipv6.h | 9 + |
| net/sunrpc/auth_gss/gss_generic_token.c | 4 +- |
| net/sunrpc/auth_gss/gss_krb5_crypto.c | 6 +- |
| net/sunrpc/auth_gss/gss_krb5_seal.c | 9 +- |
| net/sunrpc/auth_gss/gss_krb5_seqnum.c | 4 +- |
| net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- |
| net/sunrpc/auth_gss/gss_krb5_wrap.c | 8 +- |
| net/sunrpc/auth_gss/gss_spkm3_seal.c | 4 +- |
| net/sunrpc/auth_gss/svcauth_gss.c | 9 +- |
| net/sunrpc/cache.c | 1 - |
| net/sunrpc/svc.c | 15 +-- |
| net/sunrpc/svc_xprt.c | 30 +++- |
| net/sunrpc/svcauth_unix.c | 118 ++++++++++----- |
| net/sunrpc/svcsock.c | 1 + |
| net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 + |
| 42 files changed, 843 insertions(+), 480 deletions(-) |
| create mode 100644 Documentation/filesystems/nfs-rdma.txt |
| Merging ieee1394/for-next |
| $ git merge ieee1394/for-next |
| Auto-merged drivers/firewire/fw-ohci.c |
| Auto-merged lib/Kconfig.debug |
| CONFLICT (content): Merge conflict in lib/Kconfig.debug |
| Resolved 'lib/Kconfig.debug' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/debugging-via-ohci1394.txt | 13 +- |
| drivers/firewire/Kconfig | 5 + |
| drivers/firewire/fw-card.c | 52 +---- |
| drivers/firewire/fw-cdev.c | 13 +- |
| drivers/firewire/fw-device.c | 263 +++++++++++++++++---- |
| drivers/firewire/fw-device.h | 38 +++- |
| drivers/firewire/fw-iso.c | 5 - |
| drivers/firewire/fw-ohci.c | 376 ++++++++++++++++++++++++------ |
| drivers/firewire/fw-ohci.h | 2 + |
| drivers/firewire/fw-sbp2.c | 150 ++++++------- |
| drivers/firewire/fw-topology.c | 22 ++- |
| drivers/firewire/fw-topology.h | 11 +- |
| drivers/firewire/fw-transaction.c | 75 +++--- |
| drivers/firewire/fw-transaction.h | 17 +- |
| drivers/ieee1394/csr.c | 6 +- |
| drivers/ieee1394/dv1394.c | 4 +- |
| drivers/ieee1394/highlevel.c | 6 +- |
| drivers/ieee1394/ieee1394_core.c | 2 +- |
| drivers/ieee1394/nodemgr.c | 6 +- |
| drivers/ieee1394/ohci1394.c | 229 +++++++++--------- |
| drivers/ieee1394/pcilynx.c | 15 +- |
| drivers/ieee1394/raw1394.c | 2 - |
| drivers/ieee1394/sbp2.c | 11 +- |
| drivers/ieee1394/video1394.c | 4 +- |
| lib/Kconfig.debug | 10 + |
| 25 files changed, 870 insertions(+), 467 deletions(-) |
| Merging hwmon/testing |
| $ git merge hwmon/testing |
| Merge made by recursive. |
| Documentation/hwmon/w83l785ts | 3 +- |
| drivers/hwmon/adm1026.c | 22 ++++++--- |
| drivers/hwmon/adm1029.c | 30 ++++++++----- |
| drivers/hwmon/adm1031.c | 20 ++++++-- |
| drivers/hwmon/adm9240.c | 20 ++++++--- |
| drivers/hwmon/adt7470.c | 40 ++++++++++------- |
| drivers/hwmon/adt7473.c | 99 ++++++++++++++++++++++------------------ |
| drivers/hwmon/asb100.c | 20 +++++--- |
| 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 +- |
| 25 files changed, 257 insertions(+), 121 deletions(-) |
| Merging ubi/master |
| $ git merge ubi/master |
| Merge made by recursive. |
| Documentation/ABI/stable/sysfs-class-ubi | 212 ++++++++++++++++++++ |
| drivers/mtd/ubi/Kconfig | 9 +- |
| drivers/mtd/ubi/build.c | 18 +- |
| drivers/mtd/ubi/debug.h | 2 + |
| drivers/mtd/ubi/gluebi.c | 5 +- |
| 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 - |
| 9 files changed, 241 insertions(+), 21 deletions(-) |
| create mode 100644 Documentation/ABI/stable/sysfs-class-ubi |
| rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) |
| Merging kvm/master |
| $ git merge kvm/master |
| Auto-merged MAINTAINERS |
| Auto-merged arch/s390/Kconfig |
| Auto-merged arch/s390/kernel/early.c |
| Auto-merged arch/s390/kernel/setup.c |
| Auto-merged arch/s390/lib/uaccess_pt.c |
| CONFLICT (content): Merge conflict in arch/s390/lib/uaccess_pt.c |
| Auto-merged arch/x86/Kconfig |
| Auto-merged arch/x86/kernel/Makefile |
| Auto-merged arch/x86/kernel/crash.c |
| Auto-merged arch/x86/kernel/reboot.c |
| Auto-merged arch/x86/kernel/setup_32.c |
| Auto-merged arch/x86/kernel/setup_64.c |
| Removed arch/x86/kvm/segment_descriptor.h |
| Auto-merged drivers/s390/sysinfo.c |
| Auto-merged include/asm-s390/lowcore.h |
| Auto-merged include/asm-s390/sysinfo.h |
| CONFLICT (add/add): Merge conflict in include/asm-s390/sysinfo.h |
| Auto-merged include/asm-x86/kvm_host.h |
| CONFLICT (content): Merge conflict in include/asm-x86/kvm_host.h |
| Auto-merged include/asm-x86/reboot.h |
| Auto-merged include/linux/sched.h |
| Auto-merged kernel/fork.c |
| Resolved 'arch/s390/lib/uaccess_pt.c' using previous resolution. |
| Resolved 'include/asm-s390/sysinfo.h' using previous resolution. |
| Resolved 'include/asm-x86/kvm_host.h' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/ia64/kvm.txt | 82 ++ |
| Documentation/ioctl-number.txt | 2 + |
| Documentation/s390/kvm.txt | 125 +++ |
| MAINTAINERS | 10 + |
| arch/ia64/Kconfig | 3 + |
| arch/ia64/Makefile | 1 + |
| arch/ia64/kernel/mca.c | 49 + |
| arch/ia64/kernel/mca_asm.S | 5 + |
| arch/ia64/kernel/smp.c | 82 ++ |
| arch/ia64/kvm/Kconfig | 46 + |
| arch/ia64/kvm/Makefile | 61 + |
| arch/ia64/kvm/asm-offsets.c | 251 +++++ |
| arch/ia64/kvm/kvm-ia64.c | 1789 ++++++++++++++++++++++++++++++ |
| arch/ia64/kvm/kvm_fw.c | 500 +++++++++ |
| arch/ia64/kvm/kvm_minstate.h | 273 +++++ |
| arch/ia64/kvm/lapic.h | 25 + |
| arch/ia64/kvm/misc.h | 93 ++ |
| arch/ia64/kvm/mmio.c | 341 ++++++ |
| arch/ia64/kvm/optvfault.S | 918 ++++++++++++++++ |
| arch/ia64/kvm/process.c | 970 +++++++++++++++++ |
| arch/ia64/kvm/trampoline.S | 1038 ++++++++++++++++++ |
| arch/ia64/kvm/vcpu.c | 2163 +++++++++++++++++++++++++++++++++++++ |
| arch/ia64/kvm/vcpu.h | 740 +++++++++++++ |
| arch/ia64/kvm/vmm.c | 66 ++ |
| arch/ia64/kvm/vmm_ivt.S | 1424 ++++++++++++++++++++++++ |
| arch/ia64/kvm/vti.h | 290 +++++ |
| arch/ia64/kvm/vtlb.c | 636 +++++++++++ |
| arch/ia64/mm/tlb.c | 198 ++++ |
| arch/s390/Kconfig | 14 + |
| arch/s390/Makefile | 2 +- |
| arch/s390/kernel/early.c | 4 + |
| arch/s390/kernel/setup.c | 14 +- |
| arch/s390/kernel/vtime.c | 1 + |
| arch/s390/kvm/Kconfig | 43 + |
| arch/s390/kvm/Makefile | 14 + |
| arch/s390/kvm/diag.c | 67 ++ |
| arch/s390/kvm/gaccess.h | 274 +++++ |
| arch/s390/kvm/intercept.c | 216 ++++ |
| arch/s390/kvm/interrupt.c | 583 ++++++++++ |
| arch/s390/kvm/kvm-s390.c | 673 ++++++++++++ |
| arch/s390/kvm/kvm-s390.h | 64 ++ |
| arch/s390/kvm/priv.c | 323 ++++++ |
| arch/s390/kvm/sie64a.S | 47 + |
| arch/s390/kvm/sigp.c | 288 +++++ |
| arch/s390/lib/uaccess_pt.c | 3 + |
| arch/s390/mm/pgtable.c | 65 ++- |
| arch/x86/Kconfig | 19 + |
| arch/x86/kernel/Makefile | 2 + |
| arch/x86/kernel/crash.c | 3 +- |
| arch/x86/kernel/kvm.c | 247 +++++ |
| arch/x86/kernel/kvmclock.c | 187 ++++ |
| arch/x86/kernel/reboot.c | 13 +- |
| arch/x86/kernel/setup_32.c | 6 + |
| arch/x86/kernel/setup_64.c | 7 + |
| arch/x86/kvm/Kconfig | 2 +- |
| arch/x86/kvm/Makefile | 3 +- |
| arch/x86/kvm/i8254.c | 600 ++++++++++ |
| arch/x86/kvm/i8254.h | 62 ++ |
| arch/x86/kvm/irq.c | 3 + |
| arch/x86/kvm/kvm_svm.h | 2 + |
| arch/x86/kvm/lapic.c | 8 +- |
| arch/x86/kvm/mmu.c | 675 ++++++++++-- |
| arch/x86/kvm/mmu.h | 6 + |
| arch/x86/kvm/paging_tmpl.h | 86 +- |
| arch/x86/kvm/segment_descriptor.h | 29 - |
| arch/x86/kvm/svm.c | 250 ++++- |
| arch/x86/kvm/svm.h | 3 + |
| arch/x86/kvm/tss.h | 59 + |
| arch/x86/kvm/vmx.c | 243 ++++- |
| arch/x86/kvm/vmx.h | 10 +- |
| arch/x86/kvm/x86.c | 818 +++++++++++++-- |
| arch/x86/kvm/x86_emulate.c | 256 +++-- |
| drivers/s390/Makefile | 2 +- |
| drivers/s390/kvm/Makefile | 9 + |
| drivers/s390/kvm/kvm_virtio.c | 332 ++++++ |
| include/asm-ia64/gcc_intrin.h | 12 + |
| include/asm-ia64/kregs.h | 3 + |
| include/asm-ia64/kvm.h | 205 ++++- |
| include/asm-ia64/kvm_host.h | 524 +++++++++ |
| include/asm-ia64/kvm_para.h | 29 + |
| include/asm-ia64/processor.h | 63 ++ |
| include/asm-ia64/smp.h | 3 + |
| include/asm-ia64/tlb.h | 26 + |
| include/asm-s390/Kbuild | 1 + |
| include/asm-s390/kvm.h | 40 +- |
| include/asm-s390/kvm_host.h | 234 ++++ |
| include/asm-s390/kvm_para.h | 150 +++ |
| include/asm-s390/kvm_virtio.h | 53 + |
| include/asm-s390/lowcore.h | 15 +- |
| include/asm-s390/mmu.h | 1 + |
| include/asm-s390/mmu_context.h | 8 +- |
| include/asm-s390/pgtable.h | 93 ++- |
| include/asm-s390/setup.h | 1 + |
| include/asm-x86/kvm.h | 21 + |
| include/asm-x86/kvm_host.h | 74 ++- |
| include/asm-x86/kvm_para.h | 55 + |
| include/asm-x86/reboot.h | 2 + |
| include/linux/kvm.h | 59 + |
| include/linux/kvm_host.h | 39 +- |
| include/linux/kvm_para.h | 11 +- |
| include/linux/kvm_types.h | 2 + |
| include/linux/sched.h | 2 + |
| kernel/fork.c | 2 +- |
| mm/rmap.c | 7 +- |
| virt/kvm/kvm_main.c | 179 +++- |
| 105 files changed, 20170 insertions(+), 562 deletions(-) |
| create mode 100644 Documentation/ia64/kvm.txt |
| create mode 100644 Documentation/s390/kvm.txt |
| create mode 100644 arch/ia64/kvm/Kconfig |
| create mode 100644 arch/ia64/kvm/Makefile |
| create mode 100644 arch/ia64/kvm/asm-offsets.c |
| create mode 100644 arch/ia64/kvm/kvm-ia64.c |
| create mode 100644 arch/ia64/kvm/kvm_fw.c |
| create mode 100644 arch/ia64/kvm/kvm_minstate.h |
| create mode 100644 arch/ia64/kvm/lapic.h |
| create mode 100644 arch/ia64/kvm/misc.h |
| create mode 100644 arch/ia64/kvm/mmio.c |
| create mode 100644 arch/ia64/kvm/optvfault.S |
| create mode 100644 arch/ia64/kvm/process.c |
| create mode 100644 arch/ia64/kvm/trampoline.S |
| create mode 100644 arch/ia64/kvm/vcpu.c |
| create mode 100644 arch/ia64/kvm/vcpu.h |
| create mode 100644 arch/ia64/kvm/vmm.c |
| create mode 100644 arch/ia64/kvm/vmm_ivt.S |
| create mode 100644 arch/ia64/kvm/vti.h |
| create mode 100644 arch/ia64/kvm/vtlb.c |
| create mode 100644 arch/s390/kvm/Kconfig |
| create mode 100644 arch/s390/kvm/Makefile |
| create mode 100644 arch/s390/kvm/diag.c |
| create mode 100644 arch/s390/kvm/gaccess.h |
| create mode 100644 arch/s390/kvm/intercept.c |
| create mode 100644 arch/s390/kvm/interrupt.c |
| create mode 100644 arch/s390/kvm/kvm-s390.c |
| create mode 100644 arch/s390/kvm/kvm-s390.h |
| create mode 100644 arch/s390/kvm/priv.c |
| create mode 100644 arch/s390/kvm/sie64a.S |
| create mode 100644 arch/s390/kvm/sigp.c |
| create mode 100644 arch/x86/kernel/kvm.c |
| 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 |
| create mode 100644 arch/x86/kvm/tss.h |
| create mode 100644 drivers/s390/kvm/Makefile |
| create mode 100644 drivers/s390/kvm/kvm_virtio.c |
| create mode 100644 include/asm-ia64/kvm_host.h |
| create mode 100644 include/asm-ia64/kvm_para.h |
| create mode 100644 include/asm-s390/kvm_host.h |
| create mode 100644 include/asm-s390/kvm_para.h |
| create mode 100644 include/asm-s390/kvm_virtio.h |
| Merging dlm/next |
| $ git merge dlm/next |
| Auto-merged include/linux/Kbuild |
| Removed include/linux/lock_dlm_plock.h |
| Merge made by recursive. |
| fs/dlm/Makefile | 1 + |
| fs/dlm/config.c | 50 +++++++++-- |
| fs/dlm/config.h | 3 +- |
| fs/dlm/dlm_internal.h | 6 +- |
| fs/dlm/lock.c | 5 +- |
| fs/dlm/lock.h | 1 - |
| fs/dlm/main.c | 7 ++ |
| fs/dlm/member.c | 34 +++++++- |
| fs/{gfs2/locking => }/dlm/plock.c | 169 ++++++++++++++++++++++--------------- |
| fs/dlm/recoverd.c | 1 + |
| fs/gfs2/locking/dlm/Makefile | 2 +- |
| fs/gfs2/locking/dlm/lock_dlm.h | 11 +-- |
| fs/gfs2/locking/dlm/main.c | 8 -- |
| fs/gfs2/locking/dlm/mount.c | 21 +++++ |
| include/linux/Kbuild | 2 +- |
| include/linux/dlm_plock.h | 50 +++++++++++ |
| include/linux/lock_dlm_plock.h | 41 --------- |
| 17 files changed, 262 insertions(+), 150 deletions(-) |
| rename fs/{gfs2/locking => }/dlm/plock.c (67%) |
| create mode 100644 include/linux/dlm_plock.h |
| delete mode 100644 include/linux/lock_dlm_plock.h |
| Merging scsi/master |
| $ git merge scsi/master |
| Auto-merged drivers/ata/libata-scsi.c |
| Auto-merged drivers/base/transport_class.c |
| Auto-merged drivers/message/fusion/mptscsih.c |
| Auto-merged drivers/s390/scsi/zfcp_def.h |
| Auto-merged drivers/scsi/3w-9xxx.c |
| Auto-merged drivers/scsi/3w-xxxx.c |
| Auto-merged drivers/scsi/aacraid/aachba.c |
| Auto-merged drivers/scsi/ch.c |
| Auto-merged drivers/scsi/hosts.c |
| Auto-merged drivers/scsi/hptiop.c |
| Auto-merged drivers/scsi/lpfc/lpfc_attr.c |
| Auto-merged drivers/scsi/qla2xxx/qla_attr.c |
| Auto-merged drivers/scsi/qla2xxx/qla_gbl.h |
| Auto-merged drivers/scsi/raid_class.c |
| Removed drivers/scsi/scsi_debug.h |
| Auto-merged drivers/scsi/st.c |
| Auto-merged include/linux/attribute_container.h |
| Auto-merged include/linux/transport_class.h |
| Auto-merged include/scsi/scsi_host.h |
| Merge made by recursive. |
| Documentation/scsi/st.txt | 12 +- |
| arch/ia64/hp/sim/simscsi.c | 23 +- |
| drivers/ata/libata-scsi.c | 6 +- |
| drivers/base/transport_class.c | 3 +- |
| drivers/message/fusion/mptbase.c | 29 +- |
| drivers/message/fusion/mptbase.h | 5 +- |
| drivers/message/fusion/mptsas.c | 22 +- |
| drivers/message/fusion/mptscsih.c | 8 +- |
| drivers/s390/scsi/zfcp_aux.c | 33 +- |
| drivers/s390/scsi/zfcp_ccw.c | 21 +- |
| drivers/s390/scsi/zfcp_dbf.c | 1283 ++++++++++++++++++----------- |
| drivers/s390/scsi/zfcp_dbf.h | 229 +++++ |
| drivers/s390/scsi/zfcp_def.h | 169 +---- |
| drivers/s390/scsi/zfcp_erp.c | 680 +++++----------- |
| drivers/s390/scsi/zfcp_ext.h | 57 +- |
| drivers/s390/scsi/zfcp_fsf.c | 410 +++------- |
| drivers/s390/scsi/zfcp_qdio.c | 6 +- |
| drivers/s390/scsi/zfcp_scsi.c | 68 +- |
| drivers/s390/scsi/zfcp_sysfs_adapter.c | 10 +- |
| drivers/s390/scsi/zfcp_sysfs_port.c | 9 +- |
| drivers/s390/scsi/zfcp_sysfs_unit.c | 5 +- |
| drivers/scsi/3w-9xxx.c | 23 +- |
| drivers/scsi/3w-xxxx.c | 14 +- |
| drivers/scsi/BusLogic.c | 5 +- |
| drivers/scsi/BusLogic.h | 21 +- |
| drivers/scsi/FlashPoint.c | 6 +- |
| drivers/scsi/Kconfig | 14 +- |
| drivers/scsi/a2091.c | 3 + |
| drivers/scsi/a3000.c | 3 + |
| drivers/scsi/aacraid/aachba.c | 67 +- |
| drivers/scsi/aacraid/commsup.c | 2 +- |
| drivers/scsi/aic7xxx/aic79xx_osm.c | 7 +- |
| drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +- |
| drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 2 +- |
| drivers/scsi/aic94xx/aic94xx.h | 16 - |
| drivers/scsi/aic94xx/aic94xx_dev.c | 8 +- |
| drivers/scsi/aic94xx/aic94xx_dump.c | 10 +- |
| drivers/scsi/aic94xx/aic94xx_dump.h | 9 - |
| drivers/scsi/aic94xx/aic94xx_hwi.c | 44 +- |
| drivers/scsi/aic94xx/aic94xx_hwi.h | 2 - |
| drivers/scsi/aic94xx/aic94xx_init.c | 10 +- |
| drivers/scsi/aic94xx/aic94xx_reg.c | 53 +- |
| drivers/scsi/aic94xx/aic94xx_scb.c | 33 +- |
| drivers/scsi/aic94xx/aic94xx_sds.c | 4 +- |
| drivers/scsi/aic94xx/aic94xx_seq.c | 31 +- |
| drivers/scsi/aic94xx/aic94xx_seq.h | 4 - |
| drivers/scsi/aic94xx/aic94xx_task.c | 12 +- |
| drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- |
| drivers/scsi/arm/acornscsi.c | 1 - |
| drivers/scsi/arm/cumana_1.c | 1 - |
| drivers/scsi/ch.c | 33 +- |
| drivers/scsi/dc395x.c | 1 - |
| drivers/scsi/eata_pio.c | 2 - |
| drivers/scsi/gdth.c | 320 +++----- |
| drivers/scsi/gdth.h | 2 - |
| drivers/scsi/gvp11.c | 3 + |
| drivers/scsi/hosts.c | 1 - |
| drivers/scsi/hptiop.c | 7 +- |
| drivers/scsi/ips.c | 89 +-- |
| drivers/scsi/libsas/sas_scsi_host.c | 41 + |
| drivers/scsi/lpfc/lpfc.h | 5 +- |
| drivers/scsi/lpfc/lpfc_attr.c | 10 +- |
| drivers/scsi/lpfc/lpfc_ct.c | 48 +- |
| drivers/scsi/lpfc/lpfc_debugfs.c | 2 + |
| drivers/scsi/lpfc/lpfc_els.c | 121 ++-- |
| drivers/scsi/lpfc/lpfc_hbadisc.c | 73 +-- |
| drivers/scsi/lpfc/lpfc_init.c | 98 +-- |
| drivers/scsi/lpfc/lpfc_nportdisc.c | 40 +- |
| drivers/scsi/lpfc/lpfc_scsi.c | 34 +- |
| drivers/scsi/lpfc/lpfc_sli.c | 112 ++- |
| drivers/scsi/lpfc/lpfc_version.h | 2 +- |
| drivers/scsi/lpfc/lpfc_vport.c | 3 +- |
| drivers/scsi/mac_scsi.c | 1 - |
| drivers/scsi/megaraid/megaraid_sas.c | 49 +- |
| drivers/scsi/megaraid/megaraid_sas.h | 5 + |
| drivers/scsi/mvme147.c | 3 + |
| drivers/scsi/ps3rom.c | 101 +-- |
| drivers/scsi/qla2xxx/Kconfig | 3 +- |
| drivers/scsi/qla2xxx/qla_attr.c | 36 +- |
| drivers/scsi/qla2xxx/qla_dbg.c | 124 +--- |
| drivers/scsi/qla2xxx/qla_dbg.h | 23 +- |
| drivers/scsi/qla2xxx/qla_def.h | 78 ++- |
| drivers/scsi/qla2xxx/qla_dfs.c | 2 +- |
| drivers/scsi/qla2xxx/qla_fw.h | 173 ++++- |
| drivers/scsi/qla2xxx/qla_gbl.h | 33 +- |
| drivers/scsi/qla2xxx/qla_gs.c | 16 +- |
| drivers/scsi/qla2xxx/qla_init.c | 192 +++-- |
| drivers/scsi/qla2xxx/qla_inline.h | 87 +-- |
| drivers/scsi/qla2xxx/qla_iocb.c | 5 +- |
| drivers/scsi/qla2xxx/qla_isr.c | 223 +++--- |
| drivers/scsi/qla2xxx/qla_mbx.c | 318 ++++++-- |
| drivers/scsi/qla2xxx/qla_mid.c | 30 +- |
| drivers/scsi/qla2xxx/qla_os.c | 443 +++++----- |
| drivers/scsi/qla2xxx/qla_settings.h | 16 +- |
| drivers/scsi/qla2xxx/qla_sup.c | 315 ++++++-- |
| drivers/scsi/qla2xxx/qla_version.h | 6 +- |
| drivers/scsi/qla4xxx/ql4_fw.h | 4 +- |
| drivers/scsi/qla4xxx/ql4_glbl.h | 4 + |
| drivers/scsi/qla4xxx/ql4_iocb.c | 14 +- |
| drivers/scsi/qla4xxx/ql4_isr.c | 40 +- |
| drivers/scsi/qla4xxx/ql4_mbx.c | 39 + |
| drivers/scsi/qla4xxx/ql4_os.c | 96 ++- |
| drivers/scsi/raid_class.c | 2 +- |
| drivers/scsi/scsi.c | 229 ++++-- |
| drivers/scsi/scsi_debug.c | 1219 ++++++++++++--------------- |
| drivers/scsi/scsi_debug.h | 24 - |
| drivers/scsi/scsi_error.c | 150 +++- |
| drivers/scsi/scsi_lib.c | 12 +- |
| drivers/scsi/sgiwd93.c | 7 +- |
| drivers/scsi/st.c | 83 ++- |
| drivers/scsi/st.h | 3 + |
| drivers/scsi/st_options.h | 6 +- |
| drivers/scsi/stex.c | 83 +-- |
| drivers/scsi/wd33c93.c | 3 - |
| include/linux/attribute_container.h | 2 +- |
| include/linux/mtio.h | 1 + |
| include/linux/scatterlist.h | 5 + |
| include/linux/transport_class.h | 5 +- |
| include/scsi/libsas.h | 2 + |
| include/scsi/sas_ata.h | 4 +- |
| include/scsi/scsi_cmnd.h | 17 + |
| include/scsi/scsi_eh.h | 5 +- |
| include/scsi/scsi_host.h | 1 + |
| lib/scatterlist.c | 102 +++ |
| 124 files changed, 4689 insertions(+), 4307 deletions(-) |
| create mode 100644 drivers/s390/scsi/zfcp_dbf.h |
| delete mode 100644 drivers/scsi/scsi_debug.h |
| Merging ia64/test |
| $ git merge ia64/test |
| Auto-merged Documentation/kernel-parameters.txt |
| Auto-merged arch/ia64/Kconfig |
| Auto-merged arch/ia64/kernel/mca.c |
| CONFLICT (content): Merge conflict in arch/ia64/kernel/mca.c |
| Auto-merged arch/ia64/mm/tlb.c |
| CONFLICT (content): Merge conflict in arch/ia64/mm/tlb.c |
| Resolved 'arch/ia64/kernel/mca.c' using previous resolution. |
| Resolved 'arch/ia64/mm/tlb.c' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/kernel-parameters.txt | 4 + |
| arch/ia64/Kconfig | 14 + |
| arch/ia64/hp/common/sba_iommu.c | 56 ++- |
| arch/ia64/ia32/elfcore32.h | 14 +- |
| arch/ia64/ia32/sys_ia32.c | 649 ++++++++++++++++++- |
| arch/ia64/kernel/acpi.c | 4 +- |
| arch/ia64/kernel/asm-offsets.c | 13 + |
| arch/ia64/kernel/crash.c | 55 +- |
| arch/ia64/kernel/efi.c | 46 ++ |
| arch/ia64/kernel/entry.S | 65 ++ |
| arch/ia64/kernel/fsys.S | 88 ++- |
| arch/ia64/kernel/head.S | 20 + |
| arch/ia64/kernel/irq_ia64.c | 2 +- |
| arch/ia64/kernel/ivt.S | 69 ++ |
| arch/ia64/kernel/kprobes.c | 133 +++- |
| arch/ia64/kernel/mca.c | 11 +- |
| arch/ia64/kernel/minstate.h | 14 + |
| arch/ia64/kernel/numa.c | 2 +- |
| arch/ia64/kernel/patch.c | 8 +- |
| arch/ia64/kernel/perfmon.c | 4 +- |
| arch/ia64/kernel/process.c | 30 - |
| arch/ia64/kernel/ptrace.c | 1217 +++++++++++++++++++++++++--------- |
| arch/ia64/kernel/setup.c | 8 +- |
| arch/ia64/kernel/smpboot.c | 2 +- |
| arch/ia64/kernel/time.c | 78 +++ |
| arch/ia64/kernel/unaligned.c | 3 +- |
| arch/ia64/mm/contig.c | 2 - |
| arch/ia64/mm/discontig.c | 15 +- |
| arch/ia64/mm/init.c | 8 +- |
| arch/ia64/mm/numa.c | 4 +- |
| arch/ia64/mm/tlb.c | 177 +++++- |
| arch/ia64/sn/kernel/xpc_main.c | 8 +- |
| arch/ia64/sn/kernel/xpc_partition.c | 2 +- |
| include/asm-ia64/acpi.h | 33 + |
| include/asm-ia64/cputime.h | 104 +++ |
| include/asm-ia64/elf.h | 31 +- |
| include/asm-ia64/kprobes.h | 7 +- |
| include/asm-ia64/numa.h | 2 + |
| include/asm-ia64/pal.h | 72 ++- |
| include/asm-ia64/pgtable.h | 2 +- |
| include/asm-ia64/sal.h | 21 + |
| include/asm-ia64/system.h | 12 + |
| include/asm-ia64/thread_info.h | 14 + |
| include/asm-ia64/tlbflush.h | 1 + |
| 44 files changed, 2578 insertions(+), 546 deletions(-) |
| Merging tests/master |
| $ git merge tests/master |
| Renamed drivers/misc/lkdtm.c => tests/lkdtm.c |
| Auto-merged tests/lkdtm.c |
| Auto-merged Makefile |
| Auto-merged drivers/misc/Makefile |
| Auto-merged kernel/Makefile |
| Auto-merged lib/Kconfig.debug |
| CONFLICT (content): Merge conflict in lib/Kconfig.debug |
| Auto-merged lib/Makefile |
| Resolved 'lib/Kconfig.debug' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| Makefile | 1 + |
| drivers/misc/Makefile | 1 - |
| kernel/Makefile | 4 - |
| lib/Kconfig.debug | 72 +-------------------- |
| lib/Makefile | 1 - |
| tests/Kconfig | 80 +++++++++++++++++++++++ |
| tests/Makefile | 10 +++ |
| {kernel => tests}/backtracetest.c | 0 |
| {drivers/misc => tests}/lkdtm.c | 12 ++-- |
| {lib => tests}/locking-selftest-hardirq.h | 0 |
| {lib => tests}/locking-selftest-mutex.h | 0 |
| {lib => tests}/locking-selftest-rlock-hardirq.h | 0 |
| {lib => tests}/locking-selftest-rlock-softirq.h | 0 |
| {lib => tests}/locking-selftest-rlock.h | 0 |
| {lib => tests}/locking-selftest-rsem.h | 0 |
| {lib => tests}/locking-selftest-softirq.h | 0 |
| {lib => tests}/locking-selftest-spin-hardirq.h | 0 |
| {lib => tests}/locking-selftest-spin-softirq.h | 0 |
| {lib => tests}/locking-selftest-spin.h | 0 |
| {lib => tests}/locking-selftest-wlock-hardirq.h | 0 |
| {lib => tests}/locking-selftest-wlock-softirq.h | 0 |
| {lib => tests}/locking-selftest-wlock.h | 0 |
| {lib => tests}/locking-selftest-wsem.h | 0 |
| {lib => tests}/locking-selftest.c | 0 |
| {kernel => tests}/rcutorture.c | 0 |
| {kernel => tests}/rtmutex-tester.c | 2 +- |
| {kernel => tests}/test_kprobes.c | 0 |
| 27 files changed, 100 insertions(+), 83 deletions(-) |
| create mode 100644 tests/Kconfig |
| create mode 100644 tests/Makefile |
| rename {kernel => tests}/backtracetest.c (100%) |
| rename {drivers/misc => tests}/lkdtm.c (96%) |
| rename {lib => tests}/locking-selftest-hardirq.h (100%) |
| rename {lib => tests}/locking-selftest-mutex.h (100%) |
| rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) |
| rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) |
| rename {lib => tests}/locking-selftest-rlock.h (100%) |
| rename {lib => tests}/locking-selftest-rsem.h (100%) |
| rename {lib => tests}/locking-selftest-softirq.h (100%) |
| rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) |
| rename {lib => tests}/locking-selftest-spin-softirq.h (100%) |
| rename {lib => tests}/locking-selftest-spin.h (100%) |
| rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) |
| rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) |
| rename {lib => tests}/locking-selftest-wlock.h (100%) |
| rename {lib => tests}/locking-selftest-wsem.h (100%) |
| rename {lib => tests}/locking-selftest.c (100%) |
| rename {kernel => tests}/rcutorture.c (100%) |
| rename {kernel => tests}/rtmutex-tester.c (99%) |
| rename {kernel => tests}/test_kprobes.c (100%) |
| Merging ocfs2/linux-next |
| $ git merge ocfs2/linux-next |
| Auto-merged Documentation/feature-removal-schedule.txt |
| Auto-merged MAINTAINERS |
| Auto-merged fs/Kconfig |
| Merge made by recursive. |
| Documentation/ABI/obsolete/o2cb | 11 + |
| Documentation/ABI/stable/o2cb | 10 + |
| Documentation/feature-removal-schedule.txt | 11 + |
| MAINTAINERS | 1 + |
| fs/Kconfig | 26 + |
| fs/ocfs2/Makefile | 14 +- |
| fs/ocfs2/alloc.c | 465 +++++++++++++-- |
| fs/ocfs2/aops.c | 6 +- |
| fs/ocfs2/cluster/sys.c | 9 + |
| fs/ocfs2/cluster/tcp.c | 96 ++-- |
| fs/ocfs2/cluster/tcp_internal.h | 2 + |
| fs/ocfs2/dlm/Makefile | 2 +- |
| fs/ocfs2/dlm/dlmcommon.h | 49 ++ |
| fs/ocfs2/dlm/dlmdebug.c | 911 +++++++++++++++++++++++++--- |
| fs/ocfs2/dlm/dlmdebug.h | 86 +++ |
| fs/ocfs2/dlm/dlmdomain.c | 70 ++- |
| fs/ocfs2/dlm/dlmlock.c | 22 +- |
| fs/ocfs2/dlm/dlmmaster.c | 200 ++----- |
| fs/ocfs2/dlmglue.c | 645 ++++++++++++-------- |
| fs/ocfs2/dlmglue.h | 5 +- |
| fs/ocfs2/file.c | 4 +- |
| fs/ocfs2/heartbeat.c | 184 +------ |
| fs/ocfs2/heartbeat.h | 17 +- |
| fs/ocfs2/ioctl.c | 13 +- |
| fs/ocfs2/ioctl.h | 3 +- |
| fs/ocfs2/journal.c | 211 ++++++- |
| fs/ocfs2/journal.h | 4 + |
| fs/ocfs2/localalloc.c | 4 + |
| fs/ocfs2/namei.c | 4 +- |
| fs/ocfs2/ocfs2.h | 77 ++- |
| fs/ocfs2/ocfs2_fs.h | 79 +++- |
| fs/ocfs2/ocfs2_lockid.h | 2 +- |
| fs/ocfs2/slot_map.c | 454 +++++++++++--- |
| fs/ocfs2/slot_map.h | 32 +- |
| fs/ocfs2/stack_o2cb.c | 420 +++++++++++++ |
| fs/ocfs2/stack_user.c | 883 +++++++++++++++++++++++++++ |
| fs/ocfs2/stackglue.c | 568 +++++++++++++++++ |
| fs/ocfs2/stackglue.h | 261 ++++++++ |
| fs/ocfs2/suballoc.c | 103 +++- |
| fs/ocfs2/suballoc.h | 1 + |
| fs/ocfs2/super.c | 208 ++++--- |
| fs/sysfs/symlink.c | 9 +- |
| 42 files changed, 5143 insertions(+), 1039 deletions(-) |
| create mode 100644 Documentation/ABI/obsolete/o2cb |
| create mode 100644 Documentation/ABI/stable/o2cb |
| create mode 100644 fs/ocfs2/dlm/dlmdebug.h |
| create mode 100644 fs/ocfs2/stack_o2cb.c |
| create mode 100644 fs/ocfs2/stack_user.c |
| create mode 100644 fs/ocfs2/stackglue.c |
| create mode 100644 fs/ocfs2/stackglue.h |
| Merging selinux/for-akpm |
| $ git merge selinux/for-akpm |
| Auto-merged security/selinux/hooks.c |
| Auto-merged security/selinux/include/security.h |
| Auto-merged security/selinux/ss/services.c |
| Merge made by recursive. |
| security/commoncap.c | 4 +- |
| security/keys/internal.h | 8 +- |
| security/root_plug.c | 2 +- |
| security/security.c | 8 +- |
| security/selinux/Kconfig | 2 +- |
| security/selinux/avc.c | 13 ++- |
| security/selinux/hooks.c | 145 +++++++++++++++++--------- |
| security/selinux/include/av_perm_to_string.h | 5 + |
| security/selinux/include/av_permissions.h | 5 + |
| security/selinux/include/netlabel.h | 16 --- |
| security/selinux/include/objsec.h | 9 -- |
| security/selinux/include/security.h | 12 ++- |
| security/selinux/netlabel.c | 82 +++------------ |
| security/selinux/netlink.c | 2 +- |
| security/selinux/selinuxfs.c | 11 +- |
| security/selinux/ss/avtab.c | 40 ++++---- |
| security/selinux/ss/conditional.c | 16 ++-- |
| security/selinux/ss/ebitmap.c | 14 ++-- |
| security/selinux/ss/policydb.c | 65 +++++++----- |
| security/selinux/ss/policydb.h | 2 + |
| security/selinux/ss/services.c | 61 ++++++++--- |
| 21 files changed, 277 insertions(+), 245 deletions(-) |
| Merging quilt/m68k |
| $ git merge quilt/m68k |
| Merge made by recursive. |
| arch/m68k/Kconfig | 7 ------- |
| drivers/char/vme_scc.c | 4 +--- |
| drivers/video/Kconfig | 1 - |
| include/asm-m68k/bug.h | 4 ++-- |
| include/asm-m68k/uaccess.h | 6 +++++- |
| 5 files changed, 8 insertions(+), 14 deletions(-) |
| Merging powerpc/powerpc-next |
| $ git merge powerpc/powerpc-next |
| Auto-merged Documentation/kernel-parameters.txt |
| Auto-merged arch/powerpc/kernel/process.c |
| Auto-merged arch/powerpc/kernel/rtas_flash.c |
| Auto-merged arch/powerpc/kernel/setup_32.c |
| Auto-merged arch/powerpc/oprofile/cell/vma_map.c |
| Auto-merged arch/powerpc/platforms/powermac/setup.c |
| Auto-merged arch/powerpc/platforms/pseries/pci_dlpar.c |
| Auto-merged arch/powerpc/sysdev/cpm2.c |
| Auto-merged arch/ppc/platforms/radstone_ppc7d.c |
| Auto-merged lib/Makefile |
| Merge made by recursive. |
| Documentation/kernel-parameters.txt | 2 + |
| Documentation/powerpc/booting-without-of.txt | 16 - |
| Documentation/powerpc/phyp-assisted-dump.txt | 127 +++ |
| arch/powerpc/Kconfig | 37 +- |
| arch/powerpc/Makefile | 2 +- |
| arch/powerpc/boot/Makefile | 38 +- |
| 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 | 402 +++++++++ |
| arch/powerpc/boot/dts/ebony.dts | 2 - |
| arch/powerpc/boot/dts/glacier.dts | 467 +++++++++++ |
| arch/powerpc/boot/dts/haleakala.dts | 4 +- |
| arch/powerpc/boot/dts/katmai.dts | 2 +- |
| arch/powerpc/boot/dts/kilauea.dts | 4 +- |
| arch/powerpc/boot/dts/ksi8560.dts | 267 ++++++ |
| arch/powerpc/boot/dts/makalu.dts | 4 +- |
| arch/powerpc/boot/dts/rainier.dts | 6 +- |
| arch/powerpc/boot/dts/sequoia.dts | 6 +- |
| arch/powerpc/boot/dts/taishan.dts | 31 +- |
| 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/libfdt-wrapper.c | 2 +- |
| arch/powerpc/boot/ps3-head.S | 25 +- |
| arch/powerpc/boot/ps3.c | 23 +- |
| arch/powerpc/boot/simpleboot.c | 84 ++ |
| arch/powerpc/boot/treeboot-walnut.c | 2 +- |
| arch/powerpc/boot/virtex405-head.S | 30 + |
| arch/powerpc/boot/wrapper | 27 +- |
| arch/powerpc/configs/canyonlands_defconfig | 721 +++++++++++++++++ |
| arch/powerpc/configs/chrp32_defconfig | 7 +- |
| arch/powerpc/configs/g5_defconfig | 7 +- |
| arch/powerpc/configs/iseries_defconfig | 7 +- |
| arch/powerpc/configs/ksi8560_defconfig | 899 +++++++++++++++++++++ |
| arch/powerpc/configs/maple_defconfig | 131 +++- |
| arch/powerpc/configs/pmac32_defconfig | 7 +- |
| arch/powerpc/configs/ppc44x_defconfig | 14 +- |
| arch/powerpc/configs/ppc64_defconfig | 8 +- |
| arch/powerpc/configs/pseries_defconfig | 8 +- |
| arch/powerpc/kernel/asm-offsets.c | 4 - |
| arch/powerpc/kernel/btext.c | 3 +- |
| arch/powerpc/kernel/cpu_setup_44x.S | 5 +- |
| arch/powerpc/kernel/cputable.c | 28 +- |
| arch/powerpc/kernel/crash.c | 3 +- |
| arch/powerpc/kernel/crash_dump.c | 3 +- |
| arch/powerpc/kernel/head_32.S | 17 - |
| arch/powerpc/kernel/ibmebus.c | 12 +- |
| arch/powerpc/kernel/iommu.c | 4 +- |
| arch/powerpc/kernel/isa-bridge.c | 6 +- |
| arch/powerpc/kernel/lparcfg.c | 12 +- |
| arch/powerpc/kernel/machine_kexec.c | 3 +- |
| arch/powerpc/kernel/ppc_ksyms.c | 3 +- |
| arch/powerpc/kernel/process.c | 5 - |
| arch/powerpc/kernel/prom.c | 61 ++- |
| arch/powerpc/kernel/rtas.c | 4 +- |
| arch/powerpc/kernel/rtas_flash.c | 2 +- |
| arch/powerpc/kernel/rtas_pci.c | 29 +- |
| arch/powerpc/kernel/setup-common.c | 11 +- |
| arch/powerpc/kernel/setup_32.c | 12 + |
| arch/powerpc/kernel/setup_64.c | 2 +- |
| arch/powerpc/kernel/sys_ppc32.c | 5 - |
| arch/powerpc/kernel/vdso.c | 3 +- |
| arch/powerpc/kernel/vio.c | 10 +- |
| arch/powerpc/lib/string.S | 14 + |
| arch/powerpc/math-emu/fabs.c | 2 +- |
| arch/powerpc/math-emu/fadd.c | 2 +- |
| arch/powerpc/math-emu/fadds.c | 2 +- |
| arch/powerpc/math-emu/fcmpo.c | 2 +- |
| arch/powerpc/math-emu/fcmpu.c | 2 +- |
| arch/powerpc/math-emu/fctiw.c | 2 +- |
| arch/powerpc/math-emu/fctiwz.c | 2 +- |
| arch/powerpc/math-emu/fdiv.c | 6 +- |
| arch/powerpc/math-emu/fdivs.c | 6 +- |
| arch/powerpc/math-emu/fmadd.c | 2 +- |
| arch/powerpc/math-emu/fmadds.c | 2 +- |
| arch/powerpc/math-emu/fmr.c | 2 +- |
| arch/powerpc/math-emu/fmsub.c | 2 +- |
| arch/powerpc/math-emu/fmsubs.c | 2 +- |
| arch/powerpc/math-emu/fmul.c | 2 +- |
| arch/powerpc/math-emu/fmuls.c | 2 +- |
| arch/powerpc/math-emu/fnabs.c | 2 +- |
| arch/powerpc/math-emu/fneg.c | 2 +- |
| arch/powerpc/math-emu/fnmadd.c | 2 +- |
| arch/powerpc/math-emu/fnmadds.c | 2 +- |
| arch/powerpc/math-emu/fnmsub.c | 2 +- |
| arch/powerpc/math-emu/fnmsubs.c | 2 +- |
| arch/powerpc/math-emu/fres.c | 2 +- |
| arch/powerpc/math-emu/frsp.c | 2 +- |
| arch/powerpc/math-emu/frsqrte.c | 2 +- |
| arch/powerpc/math-emu/fsel.c | 2 +- |
| arch/powerpc/math-emu/fsqrt.c | 2 +- |
| arch/powerpc/math-emu/fsqrts.c | 2 +- |
| arch/powerpc/math-emu/fsub.c | 2 +- |
| arch/powerpc/math-emu/fsubs.c | 2 +- |
| arch/powerpc/math-emu/lfd.c | 2 +- |
| arch/powerpc/math-emu/lfs.c | 2 +- |
| arch/powerpc/math-emu/mcrfs.c | 4 +- |
| arch/powerpc/math-emu/mffs.c | 2 +- |
| arch/powerpc/math-emu/mtfsb0.c | 2 +- |
| arch/powerpc/math-emu/mtfsb1.c | 2 +- |
| arch/powerpc/math-emu/mtfsf.c | 2 +- |
| arch/powerpc/math-emu/mtfsfi.c | 2 +- |
| arch/powerpc/math-emu/stfd.c | 2 +- |
| arch/powerpc/math-emu/stfiwx.c | 2 +- |
| arch/powerpc/math-emu/stfs.c | 2 +- |
| arch/powerpc/mm/Makefile | 2 +- |
| arch/powerpc/mm/hash_utils_64.c | 32 +- |
| arch/powerpc/mm/init_32.c | 4 +- |
| arch/powerpc/mm/init_64.c | 4 +- |
| arch/powerpc/mm/mem.c | 5 +- |
| arch/powerpc/mm/numa.c | 3 +- |
| arch/powerpc/mm/ppc_mmu_32.c | 2 +- |
| arch/powerpc/mm/stab.c | 4 +- |
| arch/powerpc/oprofile/cell/spu_task_sync.c | 12 +- |
| arch/powerpc/oprofile/cell/vma_map.c | 10 +- |
| arch/powerpc/oprofile/op_model_cell.c | 14 +- |
| arch/powerpc/platforms/40x/ep405.c | 2 + |
| arch/powerpc/platforms/40x/kilauea.c | 4 +- |
| arch/powerpc/platforms/40x/makalu.c | 2 + |
| arch/powerpc/platforms/40x/virtex.c | 2 + |
| arch/powerpc/platforms/40x/walnut.c | 4 +- |
| arch/powerpc/platforms/44x/44x.h | 1 - |
| arch/powerpc/platforms/44x/Kconfig | 27 + |
| arch/powerpc/platforms/44x/Makefile | 2 + |
| arch/powerpc/platforms/44x/bamboo.c | 15 +- |
| arch/powerpc/platforms/44x/canyonlands.c | 63 ++ |
| arch/powerpc/platforms/44x/ebony.c | 5 +- |
| arch/powerpc/platforms/44x/katmai.c | 5 +- |
| arch/powerpc/platforms/44x/misc_44x.S | 11 - |
| arch/powerpc/platforms/44x/rainier.c | 4 +- |
| arch/powerpc/platforms/44x/sequoia.c | 4 +- |
| arch/powerpc/platforms/44x/taishan.c | 5 +- |
| arch/powerpc/platforms/44x/warp-nand.c | 3 +- |
| arch/powerpc/platforms/44x/warp.c | 6 +- |
| arch/powerpc/platforms/52xx/lite5200.c | 4 +- |
| arch/powerpc/platforms/85xx/Kconfig | 7 + |
| arch/powerpc/platforms/85xx/Makefile | 1 + |
| arch/powerpc/platforms/85xx/ksi8560.c | 257 ++++++ |
| arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 +- |
| arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +- |
| arch/powerpc/platforms/Kconfig.cputype | 2 + |
| arch/powerpc/platforms/cell/iommu.c | 10 +- |
| arch/powerpc/platforms/cell/pervasive.c | 2 +- |
| arch/powerpc/platforms/cell/ras.c | 10 +- |
| arch/powerpc/platforms/cell/spu_base.c | 8 +- |
| arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- |
| arch/powerpc/platforms/cell/spu_manage.c | 8 +- |
| arch/powerpc/platforms/cell/spufs/file.c | 4 +- |
| arch/powerpc/platforms/cell/spufs/run.c | 10 +- |
| arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 10 +- |
| arch/powerpc/platforms/iseries/pci.c | 3 +- |
| arch/powerpc/platforms/maple/pci.c | 47 -- |
| arch/powerpc/platforms/maple/setup.c | 4 +- |
| arch/powerpc/platforms/pasemi/dma_lib.c | 144 ++++ |
| arch/powerpc/platforms/powermac/setup.c | 2 +- |
| arch/powerpc/platforms/ps3/device-init.c | 78 ++- |
| arch/powerpc/platforms/ps3/htab.c | 3 +- |
| arch/powerpc/platforms/ps3/interrupt.c | 2 +- |
| arch/powerpc/platforms/ps3/mm.c | 3 +- |
| arch/powerpc/platforms/ps3/os-area.c | 3 +- |
| arch/powerpc/platforms/ps3/setup.c | 14 +- |
| arch/powerpc/platforms/ps3/spu.c | 7 + |
| arch/powerpc/platforms/pseries/Makefile | 1 + |
| arch/powerpc/platforms/pseries/eeh.c | 5 +- |
| arch/powerpc/platforms/pseries/lpar.c | 15 + |
| arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- |
| arch/powerpc/platforms/pseries/phyp_dump.c | 498 ++++++++++++ |
| arch/powerpc/platforms/pseries/reconfig.c | 12 +- |
| arch/powerpc/platforms/pseries/scanlog.c | 37 +- |
| arch/powerpc/platforms/pseries/setup.c | 4 + |
| arch/powerpc/sysdev/Makefile | 1 + |
| arch/powerpc/sysdev/cpm1.c | 2 +- |
| arch/powerpc/sysdev/cpm2.c | 2 +- |
| arch/powerpc/sysdev/dart_iommu.c | 2 +- |
| arch/powerpc/sysdev/mpic.c | 32 +- |
| arch/powerpc/sysdev/ppc4xx_pci.c | 133 +++- |
| arch/powerpc/sysdev/ppc4xx_pci.h | 59 ++ |
| arch/powerpc/sysdev/ppc4xx_soc.c | 200 +++++ |
| arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +- |
| arch/powerpc/sysdev/qe_lib/ucc_fast.c | 32 +- |
| arch/powerpc/sysdev/qe_lib/ucc_slow.c | 18 +- |
| arch/powerpc/sysdev/tsi108_dev.c | 4 +- |
| arch/powerpc/sysdev/tsi108_pci.c | 4 +- |
| arch/ppc/8xx_io/commproc.c | 2 +- |
| arch/ppc/8xx_io/fec.c | 4 +- |
| arch/ppc/kernel/head.S | 17 - |
| arch/ppc/mm/init.c | 1 - |
| arch/ppc/platforms/radstone_ppc7d.c | 8 +- |
| arch/ppc/syslib/mpc52xx_setup.c | 2 +- |
| arch/sparc64/Kconfig | 1 + |
| drivers/block/viodasd.c | 2 +- |
| drivers/char/xilinx_hwicap/buffer_icap.c | 22 +- |
| drivers/char/xilinx_hwicap/buffer_icap.h | 5 +- |
| drivers/char/xilinx_hwicap/fifo_icap.c | 31 +- |
| drivers/char/xilinx_hwicap/fifo_icap.h | 1 + |
| drivers/char/xilinx_hwicap/xilinx_hwicap.c | 63 +- |
| drivers/char/xilinx_hwicap/xilinx_hwicap.h | 24 + |
| drivers/net/Makefile | 3 +- |
| drivers/net/pasemi_mac.c | 324 ++++++-- |
| drivers/net/pasemi_mac.h | 35 +- |
| drivers/net/pasemi_mac_ethtool.c | 159 ++++ |
| drivers/net/ps3_gelic_net.c | 81 ++ |
| drivers/net/ps3_gelic_net.h | 20 + |
| drivers/of/base.c | 26 + |
| drivers/ps3/ps3-sys-manager.c | 74 ++- |
| drivers/ps3/sys-manager-core.c | 16 +- |
| drivers/serial/of_serial.c | 4 +- |
| include/asm-powerpc/Kbuild | 2 +- |
| include/asm-powerpc/abs_addr.h | 3 +- |
| include/asm-powerpc/cputhreads.h | 2 +- |
| include/asm-powerpc/dcr-native.h | 17 + |
| include/asm-powerpc/dcr-regs.h | 78 ++ |
| include/asm-powerpc/lmb.h | 82 +-- |
| include/asm-powerpc/machdep.h | 2 + |
| include/asm-powerpc/pasemi_dma.h | 77 ++- |
| include/asm-powerpc/pgtable-ppc32.h | 3 +- |
| include/asm-powerpc/phyp_dump.h | 45 + |
| include/asm-powerpc/ppc4xx.h | 18 + |
| include/asm-powerpc/ps3.h | 7 +- |
| include/asm-powerpc/sparsemem.h | 1 + |
| include/asm-powerpc/string.h | 2 + |
| include/asm-sparc64/lmb.h | 10 + |
| include/linux/lmb.h | 83 ++ |
| include/linux/of.h | 1 + |
| lib/Kconfig | 3 + |
| lib/Makefile | 2 + |
| {arch/powerpc/mm => lib}/lmb.c | 141 ++-- |
| 233 files changed, 6757 insertions(+), 864 deletions(-) |
| create mode 100644 Documentation/powerpc/phyp-assisted-dump.txt |
| 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/glacier.dts |
| create mode 100644 arch/powerpc/boot/dts/ksi8560.dts |
| create mode 100644 arch/powerpc/boot/dts/yosemite.dts |
| create mode 100644 arch/powerpc/boot/simpleboot.c |
| create mode 100644 arch/powerpc/boot/virtex405-head.S |
| create mode 100644 arch/powerpc/configs/canyonlands_defconfig |
| create mode 100644 arch/powerpc/configs/ksi8560_defconfig |
| create mode 100644 arch/powerpc/platforms/44x/canyonlands.c |
| create mode 100644 arch/powerpc/platforms/85xx/ksi8560.c |
| create mode 100644 arch/powerpc/platforms/pseries/phyp_dump.c |
| create mode 100644 arch/powerpc/sysdev/ppc4xx_soc.c |
| create mode 100644 drivers/net/pasemi_mac_ethtool.c |
| create mode 100644 include/asm-powerpc/phyp_dump.h |
| create mode 100644 include/asm-powerpc/ppc4xx.h |
| create mode 100644 include/asm-sparc64/lmb.h |
| create mode 100644 include/linux/lmb.h |
| rename {arch/powerpc/mm => lib}/lmb.c (68%) |
| Merging hrt/mm |
| $ git merge hrt/mm |
| Auto-merged Documentation/00-INDEX |
| Auto-merged kernel/time/tick-sched.c |
| Merge made by recursive. |
| Documentation/00-INDEX | 6 +-- |
| Documentation/{hrtimers => timers}/highres.txt | 0 |
| Documentation/{hrtimers => timers}/hrtimers.txt | 0 |
| Documentation/{hrtimer => timers}/timer_stats.txt | 0 |
| include/linux/hrtimer.h | 2 - |
| include/linux/spinlock.h | 37 --------------------- |
| include/linux/thread_info.h | 12 +++++++ |
| kernel/compat.c | 15 ++++---- |
| kernel/hrtimer.c | 22 ++++++------- |
| kernel/posix-cpu-timers.c | 30 ++++++++-------- |
| kernel/time/clocksource.c | 18 ++++++++-- |
| kernel/time/tick-sched.c | 6 +-- |
| kernel/timer.c | 16 ++------- |
| kernel/workqueue.c | 2 + |
| 14 files changed, 68 insertions(+), 98 deletions(-) |
| rename Documentation/{hrtimers => timers}/highres.txt (100%) |
| rename Documentation/{hrtimers => timers}/hrtimers.txt (100%) |
| rename Documentation/{hrtimer => timers}/timer_stats.txt (100%) |
| Merging lblnet/master |
| $ git merge lblnet/master |
| Already up-to-date. |
| Merging ext4/next |
| $ git merge ext4/next |
| Auto-merged arch/sparc64/mm/init.c |
| Auto-merged fs/jbd2/journal.c |
| CONFLICT (content): Merge conflict in fs/jbd2/journal.c |
| Auto-merged fs/jbd2/revoke.c |
| CONFLICT (content): Merge conflict in fs/jbd2/revoke.c |
| Resolved 'fs/jbd2/journal.c' using previous resolution. |
| Resolved 'fs/jbd2/revoke.c' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| arch/arm/mm/mmu.c | 1 + |
| arch/m68k/mm/init.c | 1 + |
| arch/sparc/kernel/sparc_ksyms.c | 2 + |
| arch/sparc64/mm/init.c | 1 + |
| fs/ext4/balloc.c | 43 ++++-- |
| fs/ext4/dir.c | 2 +- |
| fs/ext4/ext4_jbd2.c | 12 +- |
| fs/ext4/extents.c | 308 ++++++++++++++++++++++++++++++--------- |
| fs/ext4/file.c | 21 +++- |
| fs/ext4/fsync.c | 3 + |
| fs/ext4/ialloc.c | 122 ++++++++++++++-- |
| fs/ext4/inode.c | 52 ++++--- |
| fs/ext4/ioctl.c | 12 +- |
| fs/ext4/mballoc.c | 83 +++++------ |
| fs/ext4/migrate.c | 39 +++++- |
| fs/ext4/namei.c | 37 +++-- |
| fs/ext4/resize.c | 76 +++++----- |
| fs/ext4/super.c | 79 +++++++++-- |
| fs/ext4/xattr.c | 32 ++-- |
| fs/ext4/xattr.h | 7 - |
| fs/jbd2/commit.c | 19 +-- |
| fs/jbd2/journal.c | 38 +++-- |
| fs/jbd2/revoke.c | 163 +++++++++------------ |
| fs/jbd2/transaction.c | 41 +++++- |
| include/linux/ext4_fs.h | 32 ++++- |
| include/linux/ext4_fs_sb.h | 3 + |
| 26 files changed, 817 insertions(+), 412 deletions(-) |
| Merging 4xx/next |
| $ git merge 4xx/next |
| Merge made by recursive. |
| arch/powerpc/configs/{ => 40x}/ep405_defconfig | 0 |
| arch/powerpc/configs/{ => 40x}/kilauea_defconfig | 0 |
| arch/powerpc/configs/{ => 40x}/makalu_defconfig | 0 |
| arch/powerpc/configs/{ => 40x}/walnut_defconfig | 0 |
| arch/powerpc/configs/{ => 44x}/bamboo_defconfig | 0 |
| .../configs/{ => 44x}/canyonlands_defconfig | 0 |
| arch/powerpc/configs/{ => 44x}/ebony_defconfig | 0 |
| arch/powerpc/configs/{ => 44x}/katmai_defconfig | 0 |
| arch/powerpc/configs/{ => 44x}/rainier_defconfig | 0 |
| arch/powerpc/configs/{ => 44x}/sequoia_defconfig | 0 |
| arch/powerpc/configs/{ => 44x}/taishan_defconfig | 0 |
| arch/powerpc/configs/{ => 44x}/warp_defconfig | 0 |
| 12 files changed, 0 insertions(+), 0 deletions(-) |
| rename arch/powerpc/configs/{ => 40x}/ep405_defconfig (100%) |
| rename arch/powerpc/configs/{ => 40x}/kilauea_defconfig (100%) |
| rename arch/powerpc/configs/{ => 40x}/makalu_defconfig (100%) |
| rename arch/powerpc/configs/{ => 40x}/walnut_defconfig (100%) |
| rename arch/powerpc/configs/{ => 44x}/bamboo_defconfig (100%) |
| rename arch/powerpc/configs/{ => 44x}/canyonlands_defconfig (100%) |
| rename arch/powerpc/configs/{ => 44x}/ebony_defconfig (100%) |
| rename arch/powerpc/configs/{ => 44x}/katmai_defconfig (100%) |
| rename arch/powerpc/configs/{ => 44x}/rainier_defconfig (100%) |
| rename arch/powerpc/configs/{ => 44x}/sequoia_defconfig (100%) |
| rename arch/powerpc/configs/{ => 44x}/taishan_defconfig (100%) |
| rename arch/powerpc/configs/{ => 44x}/warp_defconfig (100%) |
| Merging async_tx/next |
| $ git merge async_tx/next |
| Auto-merged drivers/dma/fsldma.c |
| Auto-merged include/linux/dmaengine.h |
| Merge made by recursive. |
| crypto/async_tx/async_memcpy.c | 2 +- |
| crypto/async_tx/async_tx.c | 202 ++++++++++++++++++++++++++------ |
| crypto/async_tx/async_xor.c | 2 +- |
| drivers/dma/Kconfig | 8 -- |
| drivers/dma/dmaengine.c | 15 +-- |
| drivers/dma/fsldma.c | 57 +++++----- |
| drivers/dma/ioat_dma.c | 36 ++---- |
| drivers/dma/iop-adma.c | 60 ++++------ |
| 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 | 36 ++++--- |
| 12 files changed, 261 insertions(+), 172 deletions(-) |
| Merging udf/for_next |
| $ git merge udf/for_next |
| 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 |
| Merging security-testing/next |
| $ git merge security-testing/next |
| Auto-merged Documentation/kernel-parameters.txt |
| Auto-merged include/linux/security.h |
| Auto-merged kernel/audit.c |
| Auto-merged security/dummy.c |
| Auto-merged security/security.c |
| Auto-merged security/selinux/hooks.c |
| Auto-merged security/selinux/ss/services.c |
| Auto-merged security/smack/smack.h |
| Auto-merged security/smack/smack_lsm.c |
| Auto-merged security/smack/smackfs.c |
| Merge made by recursive. |
| Documentation/kernel-parameters.txt | 6 ++ |
| include/linux/audit.h | 29 ++++++++ |
| include/linux/security.h | 114 +++++++++++++++++++++++++++++- |
| include/linux/selinux.h | 134 ----------------------------------- |
| kernel/audit.c | 24 +++---- |
| kernel/audit.h | 25 ------- |
| kernel/auditfilter.c | 99 ++++++++++---------------- |
| kernel/auditsc.c | 74 ++++++++++--------- |
| net/netlink/af_netlink.c | 3 +- |
| security/dummy.c | 51 +++++++++++++- |
| security/security.c | 73 +++++++++++++++++++- |
| security/selinux/exports.c | 42 ----------- |
| security/selinux/hooks.c | 34 ++++++++- |
| security/selinux/include/audit.h | 65 +++++++++++++++++ |
| security/selinux/ss/services.c | 45 +++++++++--- |
| security/smack/smack.h | 2 + |
| security/smack/smack_lsm.c | 7 ++- |
| security/smack/smackfs.c | 11 +++- |
| 18 files changed, 503 insertions(+), 335 deletions(-) |
| create mode 100644 security/selinux/include/audit.h |
| Merging net/master |
| $ git merge net/master |
| Auto-merged Documentation/feature-removal-schedule.txt |
| CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt |
| Removed Documentation/networking/bcm43xx.txt |
| Auto-merged MAINTAINERS |
| CONFLICT (content): Merge conflict in MAINTAINERS |
| Auto-merged arch/s390/defconfig |
| Auto-merged drivers/net/Makefile |
| Removed drivers/net/atl1/Makefile |
| Removed drivers/net/atl1/atl1.h |
| Removed drivers/net/atl1/atl1_ethtool.c |
| Removed drivers/net/atl1/atl1_hw.c |
| Removed drivers/net/atl1/atl1_hw.h |
| Removed drivers/net/atl1/atl1_param.c |
| Auto-merged drivers/net/forcedeth.c |
| Removed drivers/net/sk98lin/Makefile |
| Removed drivers/net/sk98lin/h/lm80.h |
| Removed drivers/net/sk98lin/h/skaddr.h |
| Removed drivers/net/sk98lin/h/skcsum.h |
| Removed drivers/net/sk98lin/h/skdebug.h |
| Removed drivers/net/sk98lin/h/skdrv1st.h |
| Removed drivers/net/sk98lin/h/skdrv2nd.h |
| Removed drivers/net/sk98lin/h/skerror.h |
| Removed drivers/net/sk98lin/h/skgedrv.h |
| Removed drivers/net/sk98lin/h/skgehw.h |
| Removed drivers/net/sk98lin/h/skgehwt.h |
| Removed drivers/net/sk98lin/h/skgei2c.h |
| Removed drivers/net/sk98lin/h/skgeinit.h |
| Removed drivers/net/sk98lin/h/skgepnm2.h |
| Removed drivers/net/sk98lin/h/skgepnmi.h |
| Removed drivers/net/sk98lin/h/skgesirq.h |
| Removed drivers/net/sk98lin/h/ski2c.h |
| Removed drivers/net/sk98lin/h/skqueue.h |
| Removed drivers/net/sk98lin/h/skrlmt.h |
| Removed drivers/net/sk98lin/h/sktimer.h |
| Removed drivers/net/sk98lin/h/sktypes.h |
| Removed drivers/net/sk98lin/h/skversion.h |
| Removed drivers/net/sk98lin/h/skvpd.h |
| Removed drivers/net/sk98lin/h/xmac_ii.h |
| Removed drivers/net/sk98lin/skaddr.c |
| Removed drivers/net/sk98lin/skdim.c |
| Removed drivers/net/sk98lin/skethtool.c |
| Removed drivers/net/sk98lin/skge.c |
| Removed drivers/net/sk98lin/skgehwt.c |
| Removed drivers/net/sk98lin/skgeinit.c |
| Removed drivers/net/sk98lin/skgemib.c |
| Removed drivers/net/sk98lin/skgepnmi.c |
| Removed drivers/net/sk98lin/skgesirq.c |
| Removed drivers/net/sk98lin/ski2c.c |
| Removed drivers/net/sk98lin/sklm80.c |
| Removed drivers/net/sk98lin/skqueue.c |
| Removed drivers/net/sk98lin/skrlmt.c |
| Removed drivers/net/sk98lin/sktimer.c |
| Removed drivers/net/sk98lin/skvpd.c |
| Removed drivers/net/sk98lin/skxmac2.c |
| Auto-merged drivers/net/smc91x.h |
| Removed drivers/net/tulip/xircom_tulip_cb.c |
| Removed drivers/net/wireless/bcm43xx/Kconfig |
| Removed drivers/net/wireless/bcm43xx/Makefile |
| Removed drivers/net/wireless/bcm43xx/bcm43xx.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_main.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_main.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_power.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_power.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.h |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.c |
| Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.h |
| Removed drivers/net/wireless/iwlwifi/iwl-4965-io.h |
| Removed drivers/net/wireless/libertas/join.c |
| Removed drivers/net/wireless/libertas/join.h |
| Removed drivers/net/wireless/net2280.h |
| Removed drivers/net/wireless/rt2x00/rt2x00ring.h |
| Removed drivers/s390/net/ctcdbug.c |
| Removed drivers/s390/net/ctcdbug.h |
| Removed drivers/s390/net/ctcmain.c |
| Removed drivers/s390/net/ctcmain.h |
| Removed drivers/s390/net/qeth_fs.h |
| Removed drivers/s390/net/qeth_main.c |
| Removed drivers/s390/net/qeth_mpc.c |
| Removed drivers/s390/net/qeth_proc.c |
| Removed drivers/s390/net/qeth_sys.c |
| Removed drivers/s390/net/qeth_tso.h |
| Auto-merged include/linux/Kbuild |
| Removed include/linux/pcounter.h |
| Removed include/net/ieee80211softmac.h |
| Removed include/net/ieee80211softmac_wx.h |
| Auto-merged include/net/ipv6.h |
| Auto-merged lib/Makefile |
| Removed lib/pcounter.c |
| Auto-merged net/8021q/vlan_dev.c |
| Removed net/ieee80211/softmac/Kconfig |
| Removed net/ieee80211/softmac/Makefile |
| Removed net/ieee80211/softmac/ieee80211softmac_assoc.c |
| Removed net/ieee80211/softmac/ieee80211softmac_auth.c |
| Removed net/ieee80211/softmac/ieee80211softmac_event.c |
| Removed net/ieee80211/softmac/ieee80211softmac_io.c |
| Removed net/ieee80211/softmac/ieee80211softmac_module.c |
| Removed net/ieee80211/softmac/ieee80211softmac_priv.h |
| Removed net/ieee80211/softmac/ieee80211softmac_scan.c |
| Removed net/ieee80211/softmac/ieee80211softmac_wx.c |
| Auto-merged net/ipv4/icmp.c |
| Auto-merged net/ipv6/addrconf.c |
| Auto-merged net/ipv6/anycast.c |
| Auto-merged net/ipv6/icmp.c |
| Removed net/mac80211/rc80211_simple.c |
| Removed net/mac80211/regdomain.c |
| Auto-merged net/netlink/af_netlink.c |
| Auto-merged net/rxrpc/ar-internal.h |
| 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 |
| Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. |
| Resolved 'MAINTAINERS' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/DocBook/Makefile | 3 +- |
| Documentation/DocBook/mac80211.tmpl | 335 + |
| Documentation/feature-removal-schedule.txt | 37 +- |
| Documentation/laptops/acer-wmi.txt | 2 +- |
| Documentation/networking/bcm43xx.txt | 89 - |
| MAINTAINERS | 15 - |
| arch/ia64/hp/sim/simeth.c | 2 +- |
| arch/s390/defconfig | 8 +- |
| drivers/atm/ambassador.c | 22 +- |
| drivers/block/aoe/aoenet.c | 2 +- |
| drivers/net/3c509.c | 729 +- |
| drivers/net/8139too.c | 10 +- |
| drivers/net/8390.c | 6 +- |
| drivers/net/Kconfig | 94 +- |
| drivers/net/Makefile | 4 +- |
| drivers/net/appletalk/cops.c | 6 +- |
| drivers/net/arcnet/arcnet.c | 5 +- |
| drivers/net/arcnet/com20020.c | 7 +- |
| drivers/net/at1700.c | 7 +- |
| drivers/net/atarilance.c | 7 +- |
| drivers/net/atl1/Makefile | 2 - |
| drivers/net/atl1/atl1.h | 286 - |
| drivers/net/atl1/atl1_ethtool.c | 505 -- |
| drivers/net/atl1/atl1_hw.c | 720 -- |
| drivers/net/atl1/atl1_hw.h | 946 --- |
| drivers/net/atl1/atl1_param.c | 203 - |
| drivers/net/atlx/Makefile | 1 + |
| drivers/net/{atl1/atl1_main.c => atlx/atl1.c} | 2120 ++++-- |
| drivers/net/atlx/atl1.h | 796 ++ |
| drivers/net/atlx/atlx.c | 433 + |
| drivers/net/atlx/atlx.h | 506 ++ |
| drivers/net/atp.c | 4 +- |
| drivers/net/bonding/bond_3ad.c | 2 +- |
| drivers/net/bonding/bond_alb.c | 2 +- |
| drivers/net/bonding/bond_main.c | 12 +- |
| drivers/net/cassini.c | 12 +- |
| drivers/net/cxgb3/cxgb3_offload.c | 22 +- |
| drivers/net/cxgb3/l2t.c | 2 +- |
| drivers/net/defxx.c | 3 +- |
| drivers/net/e1000/e1000.h | 27 +- |
| drivers/net/e1000/e1000_ethtool.c | 17 +- |
| drivers/net/e1000/e1000_hw.c | 223 +- |
| drivers/net/e1000/e1000_hw.h | 62 +- |
| drivers/net/e1000/e1000_main.c | 131 +- |
| drivers/net/e1000/e1000_osdep.h | 7 - |
| drivers/net/e1000e/82571.c | 127 +- |
| drivers/net/e1000e/Makefile | 2 +- |
| drivers/net/e1000e/defines.h | 109 +- |
| drivers/net/e1000e/e1000.h | 33 +- |
| drivers/net/e1000e/es2lan.c | 105 +- |
| drivers/net/e1000e/ethtool.c | 161 +- |
| drivers/net/e1000e/hw.h | 171 +- |
| drivers/net/e1000e/ich8lan.c | 279 +- |
| drivers/net/e1000e/lib.c | 342 +- |
| drivers/net/e1000e/netdev.c | 621 +- |
| drivers/net/e1000e/param.c | 33 +- |
| drivers/net/e1000e/phy.c | 164 +- |
| drivers/net/ehea/ehea.h | 6 +- |
| drivers/net/ehea/ehea_main.c | 90 +- |
| drivers/net/forcedeth.c | 6 +- |
| drivers/net/gianfar.c | 24 +- |
| drivers/net/gianfar.h | 9 +- |
| drivers/net/hamradio/bpqether.c | 4 +- |
| drivers/net/ibmveth.c | 42 +- |
| drivers/net/ixgb/ixgb.h | 28 +- |
| drivers/net/ixgb/ixgb_ee.c | 50 +- |
| drivers/net/ixgb/ixgb_ee.h | 2 +- |
| drivers/net/ixgb/ixgb_ethtool.c | 17 +- |
| drivers/net/ixgb/ixgb_hw.c | 57 +- |
| drivers/net/ixgb/ixgb_hw.h | 18 +- |
| drivers/net/ixgb/ixgb_main.c | 96 +- |
| drivers/net/ixgb/ixgb_osdep.h | 7 - |
| drivers/net/ixgbe/ixgbe.h | 87 +- |
| drivers/net/ixgbe/ixgbe_ethtool.c | 39 +- |
| drivers/net/ixgbe/ixgbe_main.c | 1520 +++- |
| drivers/net/korina.c | 1233 +++ |
| drivers/net/loopback.c | 2 +- |
| drivers/net/macvlan.c | 2 +- |
| drivers/net/mv643xx_eth.c | 2 +- |
| drivers/net/natsemi.c | 10 +- |
| drivers/net/ni52.c | 255 +- |
| drivers/net/ni52.h | 4 +- |
| drivers/net/niu.c | 701 ++- |
| drivers/net/niu.h | 4 +- |
| drivers/net/phy/broadcom.c | 57 +- |
| drivers/net/pppoe.c | 6 +- |
| drivers/net/ps3_gelic_wireless.c | 2 +- |
| drivers/net/qla3xxx.c | 6 +- |
| drivers/net/s2io.c | 459 +- |
| drivers/net/s2io.h | 50 +- |
| drivers/net/sk98lin/Makefile | 87 - |
| drivers/net/sk98lin/h/lm80.h | 179 - |
| drivers/net/sk98lin/h/skaddr.h | 285 - |
| drivers/net/sk98lin/h/skcsum.h | 213 - |
| drivers/net/sk98lin/h/skdebug.h | 74 - |
| drivers/net/sk98lin/h/skdrv1st.h | 188 - |
| drivers/net/sk98lin/h/skdrv2nd.h | 447 - |
| drivers/net/sk98lin/h/skerror.h | 55 - |
| drivers/net/sk98lin/h/skgedrv.h | 51 - |
| drivers/net/sk98lin/h/skgehw.h | 2126 ----- |
| drivers/net/sk98lin/h/skgehwt.h | 48 - |
| drivers/net/sk98lin/h/skgei2c.h | 210 - |
| drivers/net/sk98lin/h/skgeinit.h | 797 -- |
| drivers/net/sk98lin/h/skgepnm2.h | 334 - |
| drivers/net/sk98lin/h/skgepnmi.h | 962 --- |
| drivers/net/sk98lin/h/skgesirq.h | 110 - |
| drivers/net/sk98lin/h/ski2c.h | 174 - |
| drivers/net/sk98lin/h/skqueue.h | 94 - |
| drivers/net/sk98lin/h/skrlmt.h | 438 - |
| drivers/net/sk98lin/h/sktimer.h | 63 - |
| drivers/net/sk98lin/h/sktypes.h | 69 - |
| drivers/net/sk98lin/h/skversion.h | 38 - |
| drivers/net/sk98lin/h/skvpd.h | 248 - |
| drivers/net/sk98lin/h/xmac_ii.h | 1579 ---- |
| drivers/net/sk98lin/skaddr.c | 1788 ---- |
| drivers/net/sk98lin/skdim.c | 742 -- |
| drivers/net/sk98lin/skethtool.c | 627 -- |
| drivers/net/sk98lin/skge.c | 5218 ------------ |
| drivers/net/sk98lin/skgehwt.c | 171 - |
| drivers/net/sk98lin/skgeinit.c | 2005 ----- |
| drivers/net/sk98lin/skgemib.c | 1075 --- |
| drivers/net/sk98lin/skgepnmi.c | 8198 ------------------ |
| drivers/net/sk98lin/skgesirq.c | 2229 ----- |
| drivers/net/sk98lin/ski2c.c | 1296 --- |
| drivers/net/sk98lin/sklm80.c | 141 - |
| drivers/net/sk98lin/skqueue.c | 179 - |
| drivers/net/sk98lin/skrlmt.c | 3257 ------- |
| drivers/net/sk98lin/sktimer.c | 250 - |
| drivers/net/sk98lin/skvpd.c | 1091 --- |
| drivers/net/sk98lin/skxmac2.c | 4160 --------- |
| drivers/net/skfp/fplustm.c | 12 +- |
| drivers/net/skfp/h/fplustm.h | 20 +- |
| drivers/net/skfp/hwmtm.c | 86 +- |
| drivers/net/skfp/skfddi.c | 4 +- |
| drivers/net/smc91x.c | 335 +- |
| drivers/net/smc91x.h | 331 +- |
| drivers/net/tokenring/3c359.c | 21 +- |
| drivers/net/tulip/Kconfig | 15 +- |
| drivers/net/tulip/Makefile | 1 - |
| drivers/net/tulip/xircom_tulip_cb.c | 1726 ---- |
| drivers/net/usb/dm9601.c | 10 +- |
| drivers/net/usb/rndis_host.c | 5 +- |
| drivers/net/veth.c | 2 +- |
| drivers/net/via-velocity.c | 23 +- |
| drivers/net/wan/cosa.c | 14 +- |
| drivers/net/wan/dlci.c | 2 +- |
| drivers/net/wan/hdlc.c | 4 +- |
| drivers/net/wan/lapbether.c | 4 +- |
| drivers/net/wan/syncppp.c | 2 +- |
| drivers/net/wireless/Kconfig | 113 +- |
| drivers/net/wireless/Makefile | 5 +- |
| drivers/net/wireless/adm8211.c | 95 +- |
| drivers/net/wireless/adm8211.h | 65 +- |
| drivers/net/wireless/ath5k/Kconfig | 37 + |
| drivers/net/wireless/ath5k/Makefile | 8 +- |
| drivers/net/wireless/ath5k/ath5k.h | 159 +- |
| drivers/net/wireless/ath5k/base.c | 561 +- |
| drivers/net/wireless/ath5k/base.h | 18 +- |
| drivers/net/wireless/ath5k/debug.c | 92 +- |
| drivers/net/wireless/ath5k/debug.h | 29 +- |
| drivers/net/wireless/ath5k/hw.c | 649 +- |
| drivers/net/wireless/ath5k/hw.h | 150 +- |
| drivers/net/wireless/ath5k/initvals.c | 239 +- |
| drivers/net/wireless/ath5k/phy.c | 272 +- |
| drivers/net/wireless/ath5k/reg.h | 4 +- |
| drivers/net/wireless/atmel.c | 5 +- |
| drivers/net/wireless/b43/Kconfig | 18 + |
| drivers/net/wireless/b43/Makefile | 5 +- |
| drivers/net/wireless/b43/b43.h | 195 +- |
| drivers/net/wireless/b43/dma.c | 440 +- |
| drivers/net/wireless/b43/dma.h | 14 +- |
| drivers/net/wireless/b43/main.c | 1023 ++- |
| drivers/net/wireless/b43/main.h | 11 +- |
| drivers/net/wireless/b43/nphy.c | 1 - |
| drivers/net/wireless/b43/nphy.h | 40 + |
| drivers/net/wireless/b43/pcmcia.c | 10 +- |
| drivers/net/wireless/b43/pio.c | 842 ++ |
| drivers/net/wireless/b43/pio.h | 220 + |
| drivers/net/wireless/b43/sysfs.c | 89 +- |
| drivers/net/wireless/b43/wa.c | 45 +- |
| drivers/net/wireless/b43/xmit.c | 206 +- |
| drivers/net/wireless/b43/xmit.h | 44 +- |
| drivers/net/wireless/b43legacy/b43legacy.h | 46 +- |
| drivers/net/wireless/b43legacy/main.c | 433 +- |
| drivers/net/wireless/b43legacy/xmit.c | 78 +- |
| drivers/net/wireless/bcm43xx/Kconfig | 70 - |
| drivers/net/wireless/bcm43xx/Makefile | 12 - |
| drivers/net/wireless/bcm43xx/bcm43xx.h | 997 --- |
| drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 556 -- |
| drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h | 118 - |
| drivers/net/wireless/bcm43xx/bcm43xx_dma.c | 1263 --- |
| drivers/net/wireless/bcm43xx/bcm43xx_dma.h | 386 - |
| drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | 50 - |
| drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h | 8 - |
| drivers/net/wireless/bcm43xx/bcm43xx_ilt.c | 352 - |
| drivers/net/wireless/bcm43xx/bcm43xx_ilt.h | 33 - |
| drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 307 - |
| drivers/net/wireless/bcm43xx/bcm43xx_leds.h | 62 - |
| drivers/net/wireless/bcm43xx/bcm43xx_main.c | 4281 ---------- |
| drivers/net/wireless/bcm43xx/bcm43xx_main.h | 133 - |
| drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2346 ----- |
| drivers/net/wireless/bcm43xx/bcm43xx_phy.h | 78 - |
| drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 674 -- |
| drivers/net/wireless/bcm43xx/bcm43xx_pio.h | 163 - |
| drivers/net/wireless/bcm43xx/bcm43xx_power.c | 393 - |
| drivers/net/wireless/bcm43xx/bcm43xx_power.h | 56 - |
| drivers/net/wireless/bcm43xx/bcm43xx_radio.c | 2170 ----- |
| drivers/net/wireless/bcm43xx/bcm43xx_radio.h | 115 - |
| drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | 471 - |
| drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h | 9 - |
| drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 1035 --- |
| drivers/net/wireless/bcm43xx/bcm43xx_wx.h | 36 - |
| drivers/net/wireless/bcm43xx/bcm43xx_xmit.c | 565 -- |
| drivers/net/wireless/bcm43xx/bcm43xx_xmit.h | 150 - |
| drivers/net/wireless/ipw2200.c | 16 +- |
| drivers/net/wireless/ipw2200.h | 112 +- |
| drivers/net/wireless/iwlwifi/Kconfig | 54 +- |
| drivers/net/wireless/iwlwifi/Makefile | 21 + |
| drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 96 +- |
| drivers/net/wireless/iwlwifi/iwl-3945-core.h | 80 + |
| drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 19 +- |
| drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 211 +- |
| drivers/net/wireless/iwlwifi/iwl-3945-io.h | 41 +- |
| drivers/net/wireless/iwlwifi/iwl-3945-led.c | 433 + |
| drivers/net/wireless/iwlwifi/iwl-3945-led.h | 73 + |
| drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 158 +- |
| drivers/net/wireless/iwlwifi/iwl-3945-rs.h | 12 +- |
| drivers/net/wireless/iwlwifi/iwl-3945.c | 431 +- |
| drivers/net/wireless/iwlwifi/iwl-3945.h | 115 +- |
| drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 109 +- |
| drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 509 +-- |
| drivers/net/wireless/iwlwifi/iwl-4965-io.h | 431 - |
| drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 522 +- |
| drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 20 +- |
| drivers/net/wireless/iwlwifi/iwl-4965.c | 2119 +++--- |
| drivers/net/wireless/iwlwifi/iwl-4965.h | 397 +- |
| drivers/net/wireless/iwlwifi/iwl-core.c | 279 + |
| drivers/net/wireless/iwlwifi/iwl-core.h | 218 + |
| drivers/net/wireless/iwlwifi/iwl-csr.h | 265 + |
| .../iwlwifi/{iwl-4965-debug.h => iwl-debug.h} | 65 +- |
| drivers/net/wireless/iwlwifi/iwl-debugfs.c | 320 + |
| drivers/net/wireless/iwlwifi/iwl-eeprom.c | 561 ++ |
| drivers/net/wireless/iwlwifi/iwl-eeprom.h | 375 + |
| drivers/net/wireless/iwlwifi/iwl-hcmd.c | 277 + |
| drivers/net/wireless/iwlwifi/iwl-helpers.h | 22 +- |
| drivers/net/wireless/iwlwifi/iwl-io.h | 429 + |
| drivers/net/wireless/iwlwifi/iwl-led.c | 449 + |
| drivers/net/wireless/iwlwifi/iwl-led.h | 82 + |
| drivers/net/wireless/iwlwifi/iwl-prph.h | 78 +- |
| drivers/net/wireless/iwlwifi/iwl-rfkill.c | 170 + |
| drivers/net/wireless/iwlwifi/iwl-rfkill.h | 54 + |
| drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +- |
| drivers/net/wireless/iwlwifi/iwl3945-base.c | 1076 +-- |
| drivers/net/wireless/iwlwifi/iwl4965-base.c | 3393 +++----- |
| drivers/net/wireless/libertas/11d.c | 16 +- |
| drivers/net/wireless/libertas/11d.h | 5 +- |
| drivers/net/wireless/libertas/Makefile | 2 +- |
| drivers/net/wireless/libertas/assoc.c | 1283 +++- |
| drivers/net/wireless/libertas/assoc.h | 29 +- |
| drivers/net/wireless/libertas/cmd.c | 514 +- |
| drivers/net/wireless/libertas/cmd.h | 11 +- |
| drivers/net/wireless/libertas/cmdresp.c | 210 +- |
| drivers/net/wireless/libertas/debugfs.c | 177 +- |
| drivers/net/wireless/libertas/decl.h | 13 +- |
| drivers/net/wireless/libertas/defs.h | 10 +- |
| drivers/net/wireless/libertas/dev.h | 57 +- |
| drivers/net/wireless/libertas/ethtool.c | 77 +- |
| drivers/net/wireless/libertas/host.h | 4 - |
| drivers/net/wireless/libertas/hostcmd.h | 57 +- |
| drivers/net/wireless/libertas/if_cs.c | 3 + |
| drivers/net/wireless/libertas/join.c | 895 -- |
| drivers/net/wireless/libertas/join.h | 53 - |
| drivers/net/wireless/libertas/main.c | 131 +- |
| drivers/net/wireless/libertas/rx.c | 2 +- |
| drivers/net/wireless/libertas/scan.c | 877 +-- |
| drivers/net/wireless/libertas/scan.h | 184 +- |
| drivers/net/wireless/libertas/tx.c | 5 +- |
| drivers/net/wireless/libertas/types.h | 13 + |
| drivers/net/wireless/libertas/wext.c | 62 +- |
| drivers/net/wireless/libertas/wext.h | 13 - |
| drivers/net/wireless/net2280.h | 452 - |
| drivers/net/wireless/p54/Kconfig | 63 + |
| drivers/net/wireless/p54/Makefile | 3 + |
| drivers/net/wireless/p54/net2280.h | 452 + |
| drivers/net/wireless/{ => p54}/p54.h | 4 - |
| drivers/net/wireless/{ => p54}/p54common.c | 96 +- |
| drivers/net/wireless/{ => p54}/p54common.h | 75 - |
| drivers/net/wireless/{ => p54}/p54pci.c | 0 |
| drivers/net/wireless/{ => p54}/p54pci.h | 0 |
| drivers/net/wireless/{ => p54}/p54usb.c | 0 |
| drivers/net/wireless/{ => p54}/p54usb.h | 0 |
| drivers/net/wireless/prism54/isl_ioctl.c | 51 +- |
| drivers/net/wireless/prism54/islpci_dev.c | 6 +- |
| drivers/net/wireless/prism54/islpci_dev.h | 6 +- |
| drivers/net/wireless/rndis_wlan.c | 451 +- |
| drivers/net/wireless/rt2x00/Kconfig | 60 +- |
| drivers/net/wireless/rt2x00/Makefile | 37 +- |
| drivers/net/wireless/rt2x00/rt2400pci.c | 569 +- |
| drivers/net/wireless/rt2x00/rt2400pci.h | 14 +- |
| drivers/net/wireless/rt2x00/rt2500pci.c | 591 +- |
| drivers/net/wireless/rt2x00/rt2500pci.h | 6 +- |
| drivers/net/wireless/rt2x00/rt2500usb.c | 644 +- |
| drivers/net/wireless/rt2x00/rt2500usb.h | 9 +- |
| drivers/net/wireless/rt2x00/rt2x00.h | 356 +- |
| drivers/net/wireless/rt2x00/rt2x00config.c | 167 +- |
| drivers/net/wireless/rt2x00/rt2x00debug.c | 125 +- |
| drivers/net/wireless/rt2x00/rt2x00debug.h | 2 +- |
| drivers/net/wireless/rt2x00/rt2x00dev.c | 913 +-- |
| drivers/net/wireless/rt2x00/rt2x00dump.h | 8 +- |
| drivers/net/wireless/rt2x00/rt2x00firmware.c | 21 +- |
| drivers/net/wireless/rt2x00/rt2x00leds.c | 219 + |
| drivers/net/wireless/rt2x00/rt2x00leds.h | 50 + |
| drivers/net/wireless/rt2x00/rt2x00lib.h | 100 +- |
| drivers/net/wireless/rt2x00/rt2x00mac.c | 309 +- |
| drivers/net/wireless/rt2x00/rt2x00pci.c | 287 +- |
| drivers/net/wireless/rt2x00/rt2x00pci.h | 67 +- |
| drivers/net/wireless/rt2x00/rt2x00queue.c | 304 + |
| drivers/net/wireless/rt2x00/rt2x00queue.h | 468 + |
| 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 | 331 +- |
| drivers/net/wireless/rt2x00/rt2x00usb.h | 161 +- |
| drivers/net/wireless/rt2x00/rt61pci.c | 829 +- |
| drivers/net/wireless/rt2x00/rt61pci.h | 33 +- |
| drivers/net/wireless/rt2x00/rt73usb.c | 699 +- |
| drivers/net/wireless/rt2x00/rt73usb.h | 24 +- |
| drivers/net/wireless/rtl8180.h | 2 +- |
| drivers/net/wireless/rtl8180_dev.c | 107 +- |
| 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/wavelan_cs.c | 47 +- |
| drivers/net/wireless/wavelan_cs.p.h | 26 +- |
| drivers/net/wireless/zd1211rw/zd_chip.c | 24 +- |
| drivers/net/wireless/zd1211rw/zd_chip.h | 17 +- |
| drivers/net/wireless/zd1211rw/zd_ieee80211.c | 11 +- |
| drivers/net/wireless/zd1211rw/zd_mac.c | 241 +- |
| drivers/net/wireless/zd1211rw/zd_mac.h | 5 +- |
| drivers/net/wireless/zd1211rw/zd_usb.c | 11 +- |
| drivers/net/yellowfin.c | 4 +- |
| drivers/s390/net/Kconfig | 84 +- |
| drivers/s390/net/Makefile | 12 +- |
| drivers/s390/net/ctcdbug.c | 80 - |
| drivers/s390/net/ctcdbug.h | 125 - |
| drivers/s390/net/ctcm_dbug.c | 67 + |
| drivers/s390/net/ctcm_dbug.h | 158 + |
| drivers/s390/net/ctcm_fsms.c | 2347 +++++ |
| drivers/s390/net/ctcm_fsms.h | 359 + |
| drivers/s390/net/ctcm_main.c | 1772 ++++ |
| drivers/s390/net/ctcm_main.h | 287 + |
| drivers/s390/net/ctcm_mpc.c | 2472 ++++++ |
| drivers/s390/net/ctcm_mpc.h | 239 + |
| drivers/s390/net/ctcm_sysfs.c | 210 + |
| drivers/s390/net/ctcmain.c | 3062 ------- |
| drivers/s390/net/ctcmain.h | 270 - |
| drivers/s390/net/{qeth.h => qeth_core.h} | 811 +-- |
| drivers/s390/net/qeth_core_main.c | 4540 ++++++++++ |
| drivers/s390/net/qeth_core_mpc.c | 266 + |
| drivers/s390/net/{qeth_mpc.h => qeth_core_mpc.h} | 143 +- |
| drivers/s390/net/{qeth_eddp.c => qeth_core_offl.c} | 287 +- |
| drivers/s390/net/{qeth_eddp.h => qeth_core_offl.h} | 50 +- |
| drivers/s390/net/qeth_core_sys.c | 651 ++ |
| drivers/s390/net/qeth_fs.h | 168 - |
| drivers/s390/net/qeth_l2_main.c | 1242 +++ |
| drivers/s390/net/qeth_l3.h | 76 + |
| drivers/s390/net/qeth_l3_main.c | 3391 ++++++++ |
| drivers/s390/net/qeth_l3_sys.c | 1051 +++ |
| drivers/s390/net/qeth_main.c | 8956 -------------------- |
| drivers/s390/net/qeth_mpc.c | 269 - |
| drivers/s390/net/qeth_proc.c | 316 - |
| drivers/s390/net/qeth_sys.c | 1858 ---- |
| drivers/s390/net/qeth_tso.h | 148 - |
| drivers/ssb/Kconfig | 20 + |
| drivers/ssb/Makefile | 2 + |
| drivers/ssb/driver_chipcommon.c | 12 +- |
| drivers/ssb/driver_gige.c | 294 + |
| drivers/ssb/driver_mipscore.c | 1 + |
| drivers/ssb/driver_pcicore.c | 160 +- |
| drivers/ssb/embedded.c | 90 + |
| drivers/ssb/main.c | 260 +- |
| drivers/ssb/pci.c | 211 +- |
| drivers/ssb/pcihost_wrapper.c | 10 + |
| drivers/ssb/pcmcia.c | 699 ++- |
| drivers/ssb/sprom.c | 133 + |
| drivers/ssb/ssb_private.h | 24 + |
| fs/proc/proc_net.c | 6 +- |
| include/linux/Kbuild | 2 + |
| include/linux/arcdevice.h | 4 +- |
| include/linux/atalk.h | 2 - |
| include/linux/filter.h | 35 +- |
| include/linux/icmpv6.h | 11 +- |
| include/linux/ieee80211.h | 35 + |
| include/linux/if_arp.h | 6 + |
| include/linux/if_tunnel.h | 22 +- |
| include/linux/if_vlan.h | 2 +- |
| include/linux/igmp.h | 38 +- |
| include/linux/in6.h | 26 + |
| include/linux/inetdevice.h | 8 +- |
| include/linux/ipv6.h | 48 +- |
| include/linux/mroute.h | 25 +- |
| include/linux/mroute6.h | 231 + |
| include/linux/net.h | 3 +- |
| include/linux/netdevice.h | 35 +- |
| include/linux/netfilter.h | 9 + |
| include/linux/netfilter/nf_conntrack_sip.h | 185 +- |
| include/linux/nl80211.h | 218 +- |
| include/linux/pcounter.h | 74 - |
| include/linux/pim.h | 45 + |
| include/linux/seq_file.h | 13 - |
| include/linux/seq_file_net.h | 27 + |
| include/linux/skbuff.h | 99 +- |
| include/linux/smc91x.h | 13 + |
| include/linux/ssb/ssb.h | 50 +- |
| include/linux/ssb/ssb_driver_chipcommon.h | 7 +- |
| include/linux/ssb/ssb_driver_gige.h | 174 + |
| include/linux/ssb/ssb_driver_pci.h | 19 + |
| include/linux/tcp.h | 7 + |
| include/linux/udp.h | 19 +- |
| include/linux/wireless.h | 1 + |
| include/linux/xfrm.h | 3 +- |
| include/net/addrconf.h | 39 +- |
| include/net/cfg80211.h | 159 +- |
| include/net/dst.h | 10 +- |
| include/net/icmp.h | 9 +- |
| include/net/ieee80211.h | 1 - |
| include/net/ieee80211softmac.h | 373 - |
| include/net/ieee80211softmac_wx.h | 99 - |
| include/net/inet_common.h | 11 + |
| include/net/inet_connection_sock.h | 5 - |
| include/net/inet_frag.h | 6 +- |
| include/net/inet_hashtables.h | 10 +- |
| include/net/inet_sock.h | 7 +- |
| include/net/inet_timewait_sock.h | 18 + |
| include/net/ip.h | 10 +- |
| include/net/ip6_fib.h | 18 +- |
| include/net/ip6_route.h | 54 +- |
| include/net/ipip.h | 10 + |
| include/net/ipv6.h | 58 +- |
| include/net/llc_if.h | 5 - |
| include/net/mac80211.h | 557 +- |
| include/net/ndisc.h | 17 +- |
| include/net/neighbour.h | 31 +- |
| include/net/net_namespace.h | 41 +- |
| include/net/netfilter/nf_conntrack.h | 7 +- |
| include/net/netfilter/nf_conntrack_expect.h | 22 +- |
| include/net/netfilter/nf_conntrack_helper.h | 5 +- |
| include/net/netfilter/nf_conntrack_tuple.h | 53 +- |
| include/net/netns/core.h | 16 + |
| include/net/netns/ipv4.h | 11 + |
| include/net/netns/ipv6.h | 18 + |
| include/net/pkt_cls.h | 2 +- |
| include/net/protocol.h | 3 +- |
| include/net/raw.h | 4 +- |
| include/net/request_sock.h | 9 +- |
| include/net/route.h | 5 +- |
| include/net/sctp/command.h | 3 +- |
| include/net/sctp/sctp.h | 5 - |
| include/net/sctp/sm.h | 8 - |
| include/net/sctp/structs.h | 10 +- |
| include/net/sock.h | 118 +- |
| include/net/tcp.h | 20 +- |
| include/net/tipc/tipc_bearer.h | 9 + |
| include/net/tipc/tipc_port.h | 7 - |
| include/net/udp.h | 15 +- |
| include/net/wireless.h | 186 + |
| include/net/xfrm.h | 69 +- |
| lib/Makefile | 1 - |
| lib/kobject_uevent.c | 6 +- |
| lib/pcounter.c | 58 - |
| net/8021q/vlan.c | 38 +- |
| net/8021q/vlan_dev.c | 14 +- |
| net/8021q/vlanproc.c | 2 +- |
| net/9p/error.c | 2 +- |
| net/Kconfig | 2 +- |
| net/appletalk/aarp.c | 25 +- |
| net/appletalk/ddp.c | 6 +- |
| net/atm/clip.c | 6 +- |
| net/atm/lec.c | 37 +- |
| net/atm/mpc.c | 2 +- |
| net/atm/proc.c | 48 +- |
| net/atm/resources.c | 5 +- |
| net/atm/svc.c | 2 +- |
| net/ax25/af_ax25.c | 4 +- |
| net/ax25/ax25_in.c | 2 +- |
| net/bluetooth/l2cap.c | 2 +- |
| net/bluetooth/rfcomm/sock.c | 2 +- |
| net/bluetooth/sco.c | 2 +- |
| net/bridge/br_netfilter.c | 14 +- |
| net/bridge/br_netlink.c | 4 +- |
| net/bridge/br_notify.c | 2 +- |
| net/bridge/br_stp_bpdu.c | 2 +- |
| net/bridge/br_sysfs_br.c | 6 +- |
| net/can/af_can.c | 4 +- |
| net/can/bcm.c | 2 +- |
| net/can/raw.c | 2 +- |
| net/core/dev.c | 28 +- |
| net/core/dev_mcast.c | 37 +- |
| net/core/dst.c | 15 +- |
| net/core/fib_rules.c | 8 +- |
| net/core/filter.c | 57 +- |
| net/core/neighbour.c | 171 +- |
| net/core/netpoll.c | 6 +- |
| net/core/pktgen.c | 2 +- |
| net/core/rtnetlink.c | 16 +- |
| net/core/skbuff.c | 94 + |
| net/core/sock.c | 150 +- |
| net/core/sysctl_net_core.c | 12 +- |
| net/dccp/dccp.h | 8 +- |
| net/dccp/ipv4.c | 40 +- |
| net/dccp/ipv6.c | 54 +- |
| net/dccp/minisocks.c | 2 +- |
| net/dccp/output.c | 6 +- |
| net/dccp/proto.c | 27 +- |
| net/decnet/af_decnet.c | 25 +- |
| net/decnet/dn_dev.c | 6 +- |
| net/decnet/dn_fib.c | 4 +- |
| net/decnet/dn_route.c | 6 +- |
| net/decnet/dn_table.c | 2 +- |
| net/econet/af_econet.c | 4 +- |
| net/ieee80211/Kconfig | 1 - |
| net/ieee80211/Makefile | 1 - |
| net/ieee80211/softmac/Kconfig | 12 - |
| net/ieee80211/softmac/Makefile | 9 - |
| net/ieee80211/softmac/ieee80211softmac_assoc.c | 489 -- |
| net/ieee80211/softmac/ieee80211softmac_auth.c | 413 - |
| net/ieee80211/softmac/ieee80211softmac_event.c | 189 - |
| net/ieee80211/softmac/ieee80211softmac_io.c | 488 -- |
| net/ieee80211/softmac/ieee80211softmac_module.c | 568 -- |
| net/ieee80211/softmac/ieee80211softmac_priv.h | 244 - |
| net/ieee80211/softmac/ieee80211softmac_scan.c | 254 - |
| net/ieee80211/softmac/ieee80211softmac_wx.c | 508 -- |
| net/ipv4/af_inet.c | 68 +- |
| net/ipv4/arp.c | 58 +- |
| net/ipv4/cipso_ipv4.c | 1 - |
| net/ipv4/devinet.c | 35 +- |
| net/ipv4/fib_frontend.c | 20 +- |
| net/ipv4/fib_hash.c | 5 +- |
| net/ipv4/fib_rules.c | 2 +- |
| net/ipv4/fib_trie.c | 236 +- |
| net/ipv4/icmp.c | 191 +- |
| net/ipv4/igmp.c | 45 +- |
| net/ipv4/inet_connection_sock.c | 36 +- |
| net/ipv4/inet_fragment.c | 10 +- |
| net/ipv4/inet_hashtables.c | 24 +- |
| net/ipv4/inet_timewait_sock.c | 3 +- |
| net/ipv4/ip_forward.c | 2 +- |
| net/ipv4/ip_fragment.c | 24 +- |
| net/ipv4/ip_gre.c | 6 +- |
| net/ipv4/ip_input.c | 19 +- |
| net/ipv4/ip_options.c | 63 +- |
| net/ipv4/ip_output.c | 28 +- |
| net/ipv4/ip_sockglue.c | 13 +- |
| net/ipv4/ipconfig.c | 11 +- |
| net/ipv4/ipip.c | 2 +- |
| net/ipv4/ipmr.c | 12 +- |
| 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 | 23 +- |
| net/ipv4/netfilter/ip_queue.c | 2 +- |
| net/ipv4/netfilter/ip_tables.c | 18 +- |
| net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- |
| net/ipv4/netfilter/ipt_MASQUERADE.c | 18 +- |
| .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 2 +- |
| net/ipv4/netfilter/nf_nat_helper.c | 4 +- |
| net/ipv4/netfilter/nf_nat_sip.c | 556 +- |
| net/ipv4/netfilter/nf_nat_snmp_basic.c | 12 +- |
| net/ipv4/proc.c | 71 +- |
| net/ipv4/raw.c | 47 +- |
| net/ipv4/route.c | 252 +- |
| net/ipv4/syncookies.c | 102 +- |
| net/ipv4/sysctl_net_ipv4.c | 162 +- |
| net/ipv4/tcp.c | 18 +- |
| net/ipv4/tcp_cubic.c | 35 +- |
| net/ipv4/tcp_input.c | 49 +- |
| net/ipv4/tcp_ipv4.c | 161 +- |
| net/ipv4/tcp_minisocks.c | 36 +- |
| net/ipv4/tcp_output.c | 11 +- |
| net/ipv4/tcp_timer.c | 5 + |
| net/ipv4/udp.c | 134 +- |
| net/ipv4/udp_impl.h | 6 +- |
| net/ipv4/udplite.c | 62 +- |
| net/ipv4/xfrm4_policy.c | 2 +- |
| net/ipv6/Kconfig | 18 + |
| net/ipv6/Makefile | 3 + |
| net/ipv6/addrconf.c | 689 +- |
| net/ipv6/addrlabel.c | 25 +- |
| net/ipv6/af_inet6.c | 227 +- |
| net/ipv6/anycast.c | 63 +- |
| net/ipv6/fib6_rules.c | 113 +- |
| net/ipv6/icmp.c | 145 +- |
| net/ipv6/inet6_hashtables.c | 10 +- |
| net/ipv6/ip6_fib.c | 294 +- |
| net/ipv6/ip6_flowlabel.c | 101 +- |
| net/ipv6/ip6_input.c | 92 +- |
| net/ipv6/ip6_output.c | 38 +- |
| net/ipv6/ip6_tunnel.c | 8 +- |
| net/ipv6/ip6mr.c | 1657 ++++ |
| net/ipv6/ipv6_sockglue.c | 224 +- |
| net/ipv6/mcast.c | 212 +- |
| net/ipv6/mip6.c | 20 +- |
| net/ipv6/ndisc.c | 210 +- |
| net/ipv6/netfilter.c | 4 +- |
| net/ipv6/netfilter/ip6_queue.c | 2 +- |
| net/ipv6/netfilter/ip6_tables.c | 18 +- |
| net/ipv6/netfilter/ip6t_REJECT.c | 4 +- |
| net/ipv6/netfilter/nf_conntrack_reasm.c | 15 +- |
| net/ipv6/proc.c | 73 +- |
| net/ipv6/raw.c | 47 +- |
| net/ipv6/reassembly.c | 19 +- |
| net/ipv6/route.c | 638 +- |
| net/ipv6/sit.c | 261 +- |
| net/ipv6/syncookies.c | 279 + |
| net/ipv6/sysctl_net_ipv6.c | 15 +- |
| net/ipv6/tcp_ipv6.c | 183 +- |
| net/ipv6/udp.c | 39 +- |
| net/ipv6/udp_impl.h | 2 + |
| net/ipv6/udplite.c | 40 +- |
| net/ipv6/xfrm6_input.c | 55 +- |
| net/ipv6/xfrm6_policy.c | 9 +- |
| net/ipv6/xfrm6_state.c | 171 +- |
| net/ipv6/xfrm6_tunnel.c | 45 +- |
| net/ipx/af_ipx.c | 4 +- |
| net/irda/af_irda.c | 180 +- |
| 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 | 76 +- |
| 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/iucv/af_iucv.c | 2 +- |
| net/iucv/iucv.c | 17 +- |
| 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 | 26 +- |
| net/llc/llc_input.c | 6 +- |
| net/mac80211/Kconfig | 33 +- |
| net/mac80211/Makefile | 21 +- |
| net/mac80211/aes_ccm.c | 2 +- |
| net/mac80211/cfg.c | 436 +- |
| net/mac80211/debugfs.c | 53 +- |
| net/mac80211/debugfs_key.c | 42 +- |
| net/mac80211/debugfs_key.h | 11 +- |
| net/mac80211/debugfs_netdev.c | 218 +- |
| net/mac80211/debugfs_sta.c | 181 +- |
| net/mac80211/debugfs_sta.h | 2 + |
| net/mac80211/ieee80211_i.h | 517 +- |
| net/mac80211/{ieee80211_iface.c => iface.c} | 48 +- |
| net/mac80211/key.c | 368 +- |
| net/mac80211/{ieee80211_key.h => key.h} | 39 +- |
| net/mac80211/{ieee80211_led.c => led.c} | 2 +- |
| net/mac80211/{ieee80211_led.h => led.h} | 0 |
| net/mac80211/{ieee80211.c => main.c} | 1059 ++- |
| net/mac80211/mesh.c | 449 + |
| net/mac80211/mesh.h | 290 + |
| net/mac80211/mesh_hwmp.c | 855 ++ |
| net/mac80211/mesh_pathtbl.c | 516 ++ |
| net/mac80211/mesh_plink.c | 762 ++ |
| net/mac80211/{ieee80211_sta.c => mlme.c} | 1748 +++-- |
| net/mac80211/{ieee80211_rate.c => rate.c} | 25 +- |
| net/mac80211/{ieee80211_rate.h => rate.h} | 44 +- |
| net/mac80211/rc80211_pid_algo.c | 124 +- |
| net/mac80211/rc80211_pid_debugfs.c | 2 +- |
| net/mac80211/rc80211_simple.c | 400 - |
| net/mac80211/regdomain.c | 152 - |
| net/mac80211/rx.c | 869 ++- |
| net/mac80211/sta_info.c | 698 ++- |
| net/mac80211/sta_info.h | 357 +- |
| net/mac80211/tkip.c | 70 +- |
| net/mac80211/tkip.h | 4 +- |
| net/mac80211/tx.c | 732 +- |
| net/mac80211/util.c | 172 +- |
| net/mac80211/wep.c | 40 +- |
| net/mac80211/wep.h | 10 +- |
| net/mac80211/{ieee80211_ioctl.c => wext.c} | 262 +- |
| net/mac80211/wme.c | 139 +- |
| net/mac80211/wme.h | 23 +- |
| net/mac80211/wpa.c | 152 +- |
| net/mac80211/wpa.h | 24 +- |
| net/netfilter/core.c | 8 + |
| net/netfilter/nf_conntrack_amanda.c | 14 +- |
| net/netfilter/nf_conntrack_expect.c | 81 +- |
| net/netfilter/nf_conntrack_ftp.c | 10 +- |
| net/netfilter/nf_conntrack_h323_main.c | 66 +- |
| net/netfilter/nf_conntrack_helper.c | 3 +- |
| net/netfilter/nf_conntrack_irc.c | 10 +- |
| net/netfilter/nf_conntrack_netbios_ns.c | 11 +- |
| net/netfilter/nf_conntrack_pptp.c | 14 +- |
| net/netfilter/nf_conntrack_sane.c | 11 +- |
| net/netfilter/nf_conntrack_sip.c | 1386 +++- |
| net/netfilter/nf_conntrack_standalone.c | 2 +- |
| net/netfilter/nf_conntrack_tftp.c | 11 +- |
| net/netfilter/nf_sockopt.c | 2 +- |
| net/netfilter/nfnetlink_queue.c | 2 +- |
| net/netfilter/x_tables.c | 4 +- |
| net/netlabel/netlabel_unlabeled.c | 2 +- |
| net/netlink/af_netlink.c | 83 +- |
| net/netrom/af_netrom.c | 4 +- |
| net/packet/af_packet.c | 33 +- |
| net/rose/af_rose.c | 4 +- |
| net/rxrpc/ar-internal.h | 8 +- |
| net/rxrpc/ar-proc.c | 4 +- |
| net/sched/act_api.c | 4 +- |
| net/sched/cls_api.c | 4 +- |
| net/sched/em_meta.c | 4 +- |
| net/sched/sch_api.c | 10 +- |
| net/sctp/associola.c | 8 +- |
| net/sctp/chunk.c | 23 +- |
| net/sctp/command.c | 10 +- |
| net/sctp/input.c | 3 +- |
| net/sctp/ipv6.c | 17 +- |
| net/sctp/output.c | 14 +- |
| net/sctp/outqueue.c | 17 +- |
| net/sctp/proc.c | 20 +- |
| net/sctp/protocol.c | 50 +- |
| net/sctp/sm_make_chunk.c | 2 +- |
| net/sctp/sm_sideeffect.c | 6 +- |
| net/sctp/sm_statefuns.c | 28 +- |
| net/sctp/socket.c | 25 +- |
| net/sctp/transport.c | 10 +- |
| net/socket.c | 4 +- |
| 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/eth_media.c | 4 +- |
| net/tipc/link.c | 16 +- |
| net/tipc/msg.c | 16 +- |
| net/tipc/msg.h | 50 +- |
| net/tipc/port.c | 12 +- |
| net/tipc/socket.c | 141 +- |
| net/unix/af_unix.c | 28 +- |
| net/wireless/Makefile | 2 +- |
| net/wireless/core.c | 41 + |
| net/wireless/core.h | 3 + |
| net/wireless/nl80211.c | 552 ++- |
| net/wireless/reg.c | 162 + |
| net/wireless/util.c | 121 + |
| net/wireless/wext.c | 2 +- |
| net/x25/af_x25.c | 4 +- |
| net/x25/x25_dev.c | 2 +- |
| net/xfrm/xfrm_policy.c | 132 +- |
| net/xfrm/xfrm_state.c | 53 +- |
| net/xfrm/xfrm_user.c | 71 +- |
| security/selinux/netif.c | 2 +- |
| 786 files changed, 72457 insertions(+), 110749 deletions(-) |
| create mode 100644 Documentation/DocBook/mac80211.tmpl |
| delete mode 100644 Documentation/networking/bcm43xx.txt |
| delete mode 100644 drivers/net/atl1/Makefile |
| delete mode 100644 drivers/net/atl1/atl1.h |
| delete mode 100644 drivers/net/atl1/atl1_ethtool.c |
| delete mode 100644 drivers/net/atl1/atl1_hw.c |
| delete mode 100644 drivers/net/atl1/atl1_hw.h |
| delete mode 100644 drivers/net/atl1/atl1_param.c |
| create mode 100644 drivers/net/atlx/Makefile |
| rename drivers/net/{atl1/atl1_main.c => atlx/atl1.c} (57%) |
| create mode 100644 drivers/net/atlx/atl1.h |
| create mode 100644 drivers/net/atlx/atlx.c |
| create mode 100644 drivers/net/atlx/atlx.h |
| create mode 100644 drivers/net/korina.c |
| delete mode 100644 drivers/net/sk98lin/Makefile |
| delete mode 100644 drivers/net/sk98lin/h/lm80.h |
| delete mode 100644 drivers/net/sk98lin/h/skaddr.h |
| delete mode 100644 drivers/net/sk98lin/h/skcsum.h |
| delete mode 100644 drivers/net/sk98lin/h/skdebug.h |
| delete mode 100644 drivers/net/sk98lin/h/skdrv1st.h |
| delete mode 100644 drivers/net/sk98lin/h/skdrv2nd.h |
| delete mode 100644 drivers/net/sk98lin/h/skerror.h |
| delete mode 100644 drivers/net/sk98lin/h/skgedrv.h |
| delete mode 100644 drivers/net/sk98lin/h/skgehw.h |
| delete mode 100644 drivers/net/sk98lin/h/skgehwt.h |
| delete mode 100644 drivers/net/sk98lin/h/skgei2c.h |
| delete mode 100644 drivers/net/sk98lin/h/skgeinit.h |
| delete mode 100644 drivers/net/sk98lin/h/skgepnm2.h |
| delete mode 100644 drivers/net/sk98lin/h/skgepnmi.h |
| delete mode 100644 drivers/net/sk98lin/h/skgesirq.h |
| delete mode 100644 drivers/net/sk98lin/h/ski2c.h |
| delete mode 100644 drivers/net/sk98lin/h/skqueue.h |
| delete mode 100644 drivers/net/sk98lin/h/skrlmt.h |
| delete mode 100644 drivers/net/sk98lin/h/sktimer.h |
| delete mode 100644 drivers/net/sk98lin/h/sktypes.h |
| delete mode 100644 drivers/net/sk98lin/h/skversion.h |
| delete mode 100644 drivers/net/sk98lin/h/skvpd.h |
| delete mode 100644 drivers/net/sk98lin/h/xmac_ii.h |
| delete mode 100644 drivers/net/sk98lin/skaddr.c |
| delete mode 100644 drivers/net/sk98lin/skdim.c |
| delete mode 100644 drivers/net/sk98lin/skethtool.c |
| delete mode 100644 drivers/net/sk98lin/skge.c |
| delete mode 100644 drivers/net/sk98lin/skgehwt.c |
| delete mode 100644 drivers/net/sk98lin/skgeinit.c |
| delete mode 100644 drivers/net/sk98lin/skgemib.c |
| delete mode 100644 drivers/net/sk98lin/skgepnmi.c |
| delete mode 100644 drivers/net/sk98lin/skgesirq.c |
| delete mode 100644 drivers/net/sk98lin/ski2c.c |
| delete mode 100644 drivers/net/sk98lin/sklm80.c |
| delete mode 100644 drivers/net/sk98lin/skqueue.c |
| delete mode 100644 drivers/net/sk98lin/skrlmt.c |
| delete mode 100644 drivers/net/sk98lin/sktimer.c |
| delete mode 100644 drivers/net/sk98lin/skvpd.c |
| delete mode 100644 drivers/net/sk98lin/skxmac2.c |
| delete mode 100644 drivers/net/tulip/xircom_tulip_cb.c |
| create mode 100644 drivers/net/wireless/ath5k/Kconfig |
| create mode 100644 drivers/net/wireless/b43/pio.c |
| create mode 100644 drivers/net/wireless/b43/pio.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/Kconfig |
| delete mode 100644 drivers/net/wireless/bcm43xx/Makefile |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_dma.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_dma.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ilt.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_leds.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_leds.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_main.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_main.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_phy.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_phy.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_pio.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_pio.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_power.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_power.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_radio.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_radio.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_wx.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_wx.h |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_xmit.c |
| delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_xmit.h |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-core.h |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-led.c |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-led.h |
| delete mode 100644 drivers/net/wireless/iwlwifi/iwl-4965-io.h |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-core.c |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-core.h |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-csr.h |
| rename drivers/net/wireless/iwlwifi/{iwl-4965-debug.h => iwl-debug.h} (79%) |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-debugfs.c |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-eeprom.c |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-eeprom.h |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-hcmd.c |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-io.h |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-led.c |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-led.h |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-rfkill.c |
| create mode 100644 drivers/net/wireless/iwlwifi/iwl-rfkill.h |
| delete mode 100644 drivers/net/wireless/libertas/join.c |
| delete mode 100644 drivers/net/wireless/libertas/join.h |
| delete mode 100644 drivers/net/wireless/net2280.h |
| create mode 100644 drivers/net/wireless/p54/Kconfig |
| create mode 100644 drivers/net/wireless/p54/Makefile |
| create mode 100644 drivers/net/wireless/p54/net2280.h |
| rename drivers/net/wireless/{ => p54}/p54.h (93%) |
| rename drivers/net/wireless/{ => p54}/p54common.c (91%) |
| rename drivers/net/wireless/{ => p54}/p54common.h (80%) |
| rename drivers/net/wireless/{ => p54}/p54pci.c (100%) |
| rename drivers/net/wireless/{ => p54}/p54pci.h (100%) |
| rename drivers/net/wireless/{ => p54}/p54usb.c (100%) |
| rename drivers/net/wireless/{ => p54}/p54usb.h (100%) |
| 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 |
| delete mode 100644 drivers/s390/net/ctcdbug.c |
| delete mode 100644 drivers/s390/net/ctcdbug.h |
| create mode 100644 drivers/s390/net/ctcm_dbug.c |
| create mode 100644 drivers/s390/net/ctcm_dbug.h |
| create mode 100644 drivers/s390/net/ctcm_fsms.c |
| create mode 100644 drivers/s390/net/ctcm_fsms.h |
| create mode 100644 drivers/s390/net/ctcm_main.c |
| create mode 100644 drivers/s390/net/ctcm_main.h |
| create mode 100644 drivers/s390/net/ctcm_mpc.c |
| create mode 100644 drivers/s390/net/ctcm_mpc.h |
| create mode 100644 drivers/s390/net/ctcm_sysfs.c |
| delete mode 100644 drivers/s390/net/ctcmain.c |
| delete mode 100644 drivers/s390/net/ctcmain.h |
| rename drivers/s390/net/{qeth.h => qeth_core.h} (52%) |
| create mode 100644 drivers/s390/net/qeth_core_main.c |
| create mode 100644 drivers/s390/net/qeth_core_mpc.c |
| rename drivers/s390/net/{qeth_mpc.h => qeth_core_mpc.h} (78%) |
| rename drivers/s390/net/{qeth_eddp.c => qeth_core_offl.c} (67%) |
| rename drivers/s390/net/{qeth_eddp.h => qeth_core_offl.h} (55%) |
| create mode 100644 drivers/s390/net/qeth_core_sys.c |
| delete mode 100644 drivers/s390/net/qeth_fs.h |
| create mode 100644 drivers/s390/net/qeth_l2_main.c |
| create mode 100644 drivers/s390/net/qeth_l3.h |
| create mode 100644 drivers/s390/net/qeth_l3_main.c |
| create mode 100644 drivers/s390/net/qeth_l3_sys.c |
| delete mode 100644 drivers/s390/net/qeth_main.c |
| delete mode 100644 drivers/s390/net/qeth_mpc.c |
| delete mode 100644 drivers/s390/net/qeth_proc.c |
| delete mode 100644 drivers/s390/net/qeth_sys.c |
| delete mode 100644 drivers/s390/net/qeth_tso.h |
| create mode 100644 drivers/ssb/driver_gige.c |
| create mode 100644 drivers/ssb/sprom.c |
| create mode 100644 include/linux/mroute6.h |
| delete mode 100644 include/linux/pcounter.h |
| create mode 100644 include/linux/pim.h |
| create mode 100644 include/linux/seq_file_net.h |
| create mode 100644 include/linux/smc91x.h |
| create mode 100644 include/linux/ssb/ssb_driver_gige.h |
| delete mode 100644 include/net/ieee80211softmac.h |
| delete mode 100644 include/net/ieee80211softmac_wx.h |
| create mode 100644 include/net/netns/core.h |
| delete mode 100644 lib/pcounter.c |
| delete mode 100644 net/ieee80211/softmac/Kconfig |
| delete mode 100644 net/ieee80211/softmac/Makefile |
| delete mode 100644 net/ieee80211/softmac/ieee80211softmac_assoc.c |
| delete mode 100644 net/ieee80211/softmac/ieee80211softmac_auth.c |
| delete mode 100644 net/ieee80211/softmac/ieee80211softmac_event.c |
| delete mode 100644 net/ieee80211/softmac/ieee80211softmac_io.c |
| delete mode 100644 net/ieee80211/softmac/ieee80211softmac_module.c |
| delete mode 100644 net/ieee80211/softmac/ieee80211softmac_priv.h |
| delete mode 100644 net/ieee80211/softmac/ieee80211softmac_scan.c |
| delete mode 100644 net/ieee80211/softmac/ieee80211softmac_wx.c |
| create mode 100644 net/ipv6/ip6mr.c |
| create mode 100644 net/ipv6/syncookies.c |
| rename net/mac80211/{ieee80211_iface.c => iface.c} (88%) |
| rename net/mac80211/{ieee80211_key.h => key.h} (70%) |
| rename net/mac80211/{ieee80211_led.c => led.c} (99%) |
| rename net/mac80211/{ieee80211_led.h => led.h} (100%) |
| rename net/mac80211/{ieee80211.c => main.c} (59%) |
| create mode 100644 net/mac80211/mesh.c |
| create mode 100644 net/mac80211/mesh.h |
| create mode 100644 net/mac80211/mesh_hwmp.c |
| create mode 100644 net/mac80211/mesh_pathtbl.c |
| create mode 100644 net/mac80211/mesh_plink.c |
| rename net/mac80211/{ieee80211_sta.c => mlme.c} (72%) |
| rename net/mac80211/{ieee80211_rate.c => rate.c} (91%) |
| rename net/mac80211/{ieee80211_rate.h => rate.h} (82%) |
| delete mode 100644 net/mac80211/rc80211_simple.c |
| delete mode 100644 net/mac80211/regdomain.c |
| rename net/mac80211/{ieee80211_ioctl.c => wext.c} (87%) |
| create mode 100644 net/wireless/reg.c |
| create mode 100644 net/wireless/util.c |
| Merging galak/powerpc-next |
| $ git merge galak/powerpc-next |
| Merge made by recursive. |
| .../configs/{ => 83xx}/mpc8313_rdb_defconfig | 0 |
| .../configs/{ => 83xx}/mpc8315_rdb_defconfig | 0 |
| .../configs/{ => 83xx}/mpc832x_mds_defconfig | 0 |
| .../configs/{ => 83xx}/mpc832x_rdb_defconfig | 0 |
| .../configs/{ => 83xx}/mpc834x_itx_defconfig | 0 |
| .../configs/{ => 83xx}/mpc834x_itxgp_defconfig | 0 |
| .../configs/{ => 83xx}/mpc834x_mds_defconfig | 0 |
| .../configs/{ => 83xx}/mpc836x_mds_defconfig | 0 |
| .../configs/{ => 83xx}/mpc837x_mds_defconfig | 0 |
| .../configs/{ => 83xx}/mpc837x_rdb_defconfig | 0 |
| arch/powerpc/configs/{ => 83xx}/sbc834x_defconfig | 0 |
| arch/powerpc/configs/{ => 85xx}/ksi8560_defconfig | 0 |
| .../configs/{ => 85xx}/mpc8540_ads_defconfig | 0 |
| .../configs/{ => 85xx}/mpc8544_ds_defconfig | 0 |
| .../configs/{ => 85xx}/mpc8560_ads_defconfig | 0 |
| .../configs/{ => 85xx}/mpc8568mds_defconfig | 0 |
| .../configs/{ => 85xx}/mpc8572_ds_defconfig | 0 |
| .../configs/{ => 85xx}/mpc85xx_cds_defconfig | 0 |
| arch/powerpc/configs/{ => 85xx}/sbc8548_defconfig | 0 |
| arch/powerpc/configs/{ => 85xx}/sbc8560_defconfig | 0 |
| arch/powerpc/configs/{ => 85xx}/stx_gp3_defconfig | 0 |
| arch/powerpc/configs/{ => 85xx}/tqm8540_defconfig | 0 |
| arch/powerpc/configs/{ => 85xx}/tqm8541_defconfig | 0 |
| arch/powerpc/configs/{ => 85xx}/tqm8555_defconfig | 0 |
| arch/powerpc/configs/{ => 85xx}/tqm8560_defconfig | 0 |
| arch/powerpc/kernel/entry_32.S | 30 ++++++++++++----- |
| arch/powerpc/kernel/head_44x.S | 4 +- |
| arch/powerpc/kernel/head_booke.h | 33 ++++++++++++-------- |
| arch/powerpc/kernel/head_fsl_booke.S | 10 +++++- |
| 29 files changed, 51 insertions(+), 26 deletions(-) |
| rename arch/powerpc/configs/{ => 83xx}/mpc8313_rdb_defconfig (100%) |
| rename arch/powerpc/configs/{ => 83xx}/mpc8315_rdb_defconfig (100%) |
| rename arch/powerpc/configs/{ => 83xx}/mpc832x_mds_defconfig (100%) |
| rename arch/powerpc/configs/{ => 83xx}/mpc832x_rdb_defconfig (100%) |
| rename arch/powerpc/configs/{ => 83xx}/mpc834x_itx_defconfig (100%) |
| rename arch/powerpc/configs/{ => 83xx}/mpc834x_itxgp_defconfig (100%) |
| rename arch/powerpc/configs/{ => 83xx}/mpc834x_mds_defconfig (100%) |
| rename arch/powerpc/configs/{ => 83xx}/mpc836x_mds_defconfig (100%) |
| rename arch/powerpc/configs/{ => 83xx}/mpc837x_mds_defconfig (100%) |
| rename arch/powerpc/configs/{ => 83xx}/mpc837x_rdb_defconfig (100%) |
| rename arch/powerpc/configs/{ => 83xx}/sbc834x_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/ksi8560_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/mpc8540_ads_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/mpc8544_ds_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/mpc8560_ads_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/mpc8568mds_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/mpc8572_ds_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/mpc85xx_cds_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/sbc8548_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/sbc8560_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/stx_gp3_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/tqm8540_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/tqm8541_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/tqm8555_defconfig (100%) |
| rename arch/powerpc/configs/{ => 85xx}/tqm8560_defconfig (100%) |
| Merging mtd/master |
| $ git merge mtd/master |
| Merge made by recursive. |
| drivers/mtd/onenand/onenand_base.c | 32 +++++++++++++++++--------------- |
| fs/jffs2/fs.c | 14 +++++++++++--- |
| 2 files changed, 28 insertions(+), 18 deletions(-) |
| Merging wireless/master |
| $ git merge wireless/master |
| Already up-to-date. |
| Merging crypto/master |
| $ git merge crypto/master |
| Auto-merged arch/s390/crypto/sha1_s390.c |
| Auto-merged arch/s390/crypto/sha256_s390.c |
| Auto-merged drivers/crypto/Kconfig |
| Merge made by recursive. |
| arch/s390/crypto/Makefile | 5 +- |
| arch/s390/crypto/crypt_s390.h | 2 + |
| arch/s390/crypto/sha.h | 35 + |
| arch/s390/crypto/sha1_s390.c | 91 +- |
| arch/s390/crypto/sha256_s390.c | 90 +- |
| arch/s390/crypto/sha512_s390.c | 114 + |
| arch/s390/crypto/sha_common.c | 97 + |
| arch/x86/crypto/aes-i586-asm_32.S | 3 - |
| crypto/Kconfig | 638 +- |
| crypto/Makefile | 6 +- |
| crypto/aes_generic.c | 56 +- |
| crypto/anubis.c | 8 +- |
| crypto/api.c | 3 + |
| crypto/blowfish.c | 8 +- |
| crypto/cast5.c | 8 +- |
| crypto/cast6.c | 8 +- |
| crypto/crc32c.c | 8 +- |
| crypto/crypto_null.c | 8 +- |
| crypto/cts.c | 347 + |
| crypto/deflate.c | 8 +- |
| crypto/des_generic.c | 8 +- |
| crypto/fcrypt.c | 8 +- |
| crypto/khazad.c | 8 +- |
| crypto/lrw.c | 5 +- |
| crypto/lzo.c | 8 +- |
| crypto/md4.c | 8 +- |
| crypto/md5.c | 8 +- |
| crypto/proc.c | 8 +- |
| crypto/salsa20_generic.c | 8 +- |
| crypto/serpent.c | 8 +- |
| crypto/sha1_generic.c | 8 +- |
| crypto/sha256_generic.c | 8 +- |
| crypto/{sha512.c => sha512_generic.c} | 31 +- |
| crypto/tcrypt.c | 529 +- |
| crypto/tcrypt.h |11923 +++++++++++++++++---------------- |
| crypto/tea.c | 8 +- |
| crypto/tgr192.c | 8 +- |
| crypto/twofish.c | 8 +- |
| crypto/wp512.c | 8 +- |
| drivers/crypto/Kconfig | 14 + |
| drivers/crypto/padlock-aes.c | 320 +- |
| include/crypto/aes.h | 8 +- |
| include/linux/crypto.h | 7 - |
| 43 files changed, 7407 insertions(+), 7093 deletions(-) |
| create mode 100644 arch/s390/crypto/sha.h |
| create mode 100644 arch/s390/crypto/sha512_s390.c |
| create mode 100644 arch/s390/crypto/sha_common.c |
| create mode 100644 crypto/cts.c |
| rename crypto/{sha512.c => sha512_generic.c} (95%) |
| Merging vfs/vfs-2.6.25 |
| $ git merge vfs/vfs-2.6.25 |
| Auto-merged fs/nfs/dir.c |
| Auto-merged fs/nfsd/nfs4state.c |
| Auto-merged fs/nfsd/vfs.c |
| Auto-merged fs/ocfs2/ioctl.c |
| Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c |
| CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c |
| Auto-merged fs/xfs/linux-2.6/xfs_iops.c |
| Auto-merged fs/xfs/linux-2.6/xfs_lrw.c |
| Auto-merged fs/xfs/quota/xfs_qm.c |
| Auto-merged fs/xfs/quota/xfs_qm_syscalls.c |
| CONFLICT (content): Merge conflict in fs/xfs/quota/xfs_qm_syscalls.c |
| Auto-merged fs/xfs/xfs_bmap.c |
| Auto-merged fs/xfs/xfs_dir2.c |
| Auto-merged fs/xfs/xfs_ialloc.c |
| CONFLICT (content): Merge conflict in fs/xfs/xfs_ialloc.c |
| Auto-merged fs/xfs/xfs_inode.c |
| Auto-merged fs/xfs/xfs_inode_item.c |
| Auto-merged fs/xfs/xfs_itable.c |
| Auto-merged fs/xfs/xfs_log.c |
| Auto-merged fs/xfs/xfs_log_priv.h |
| Auto-merged fs/xfs/xfs_log_recover.c |
| Auto-merged fs/xfs/xfs_mount.c |
| Auto-merged fs/xfs/xfs_sb.h |
| CONFLICT (content): Merge conflict in fs/xfs/xfs_sb.h |
| Auto-merged fs/xfs/xfs_utils.c |
| Auto-merged fs/xfs/xfs_vfsops.c |
| Auto-merged fs/xfs/xfs_vnodeops.c |
| Auto-merged include/linux/security.h |
| Auto-merged include/linux/seq_file.h |
| Auto-merged lib/Kconfig.debug |
| Auto-merged net/unix/af_unix.c |
| Auto-merged security/dummy.c |
| Auto-merged security/security.c |
| Auto-merged security/selinux/hooks.c |
| Auto-merged security/smack/smack_lsm.c |
| Auto-merged virt/kvm/kvm_main.c |
| Recorded preimage for 'fs/xfs/xfs_sb.h' |
| Resolved 'fs/xfs/linux-2.6/xfs_ioctl.c' using previous resolution. |
| Resolved 'fs/xfs/quota/xfs_qm_syscalls.c' using previous resolution. |
| Resolved 'fs/xfs/xfs_ialloc.c' using previous resolution. |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| Documentation/filesystems/proc.txt | 38 +++ |
| fs/anon_inodes.c | 24 ++- |
| fs/dcache.c | 114 +++++-- |
| fs/eventfd.c | 5 +- |
| fs/eventpoll.c | 7 +- |
| fs/ext2/ioctl.c | 47 ++- |
| fs/ext3/ioctl.c | 103 ++++-- |
| fs/fat/file.c | 12 +- |
| fs/file_table.c | 42 +++- |
| fs/hfsplus/ioctl.c | 38 ++- |
| fs/inode.c | 51 ++-- |
| fs/internal.h | 11 + |
| fs/jfs/ioctl.c | 33 ++- |
| fs/namei.c | 275 ++++++++++++---- |
| fs/namespace.c | 644 ++++++++++++++++++++++++++++++++---- |
| fs/ncpfs/ioctl.c | 54 +++- |
| fs/nfs/dir.c | 3 +- |
| fs/nfsd/nfs4proc.c | 7 +- |
| fs/nfsd/nfs4recover.c | 5 + |
| fs/nfsd/nfs4state.c | 3 +- |
| fs/nfsd/vfs.c | 26 ++- |
| fs/ocfs2/ioctl.c | 11 +- |
| fs/open.c | 149 ++++++--- |
| fs/pnode.c | 60 ++++- |
| fs/pnode.h | 2 + |
| fs/proc/base.c | 121 ++++--- |
| fs/reiserfs/ioctl.c | 63 +++-- |
| fs/seq_file.c | 111 +++++-- |
| fs/signalfd.c | 6 +- |
| fs/super.c | 25 ++- |
| fs/timerfd.c | 5 +- |
| fs/utimes.c | 18 +- |
| fs/xattr.c | 16 +- |
| fs/xfs/linux-2.6/xfs_ioctl.c | 15 +- |
| fs/xfs/linux-2.6/xfs_iops.c | 7 - |
| fs/xfs/linux-2.6/xfs_lrw.c | 9 +- |
| include/linux/anon_inodes.h | 6 +- |
| include/linux/dcache.h | 3 +- |
| include/linux/file.h | 1 + |
| include/linux/fs.h | 58 +++- |
| include/linux/mnt_namespace.h | 12 + |
| include/linux/mount.h | 15 +- |
| include/linux/security.h | 52 ++-- |
| include/linux/seq_file.h | 6 + |
| ipc/mqueue.c | 25 ++- |
| lib/Kconfig.debug | 10 + |
| net/unix/af_unix.c | 4 + |
| security/dummy.c | 10 +- |
| security/security.c | 20 +- |
| security/selinux/hooks.c | 8 +- |
| security/smack/smack_lsm.c | 4 +- |
| virt/kvm/kvm_main.c | 17 +- |
| 52 files changed, 1850 insertions(+), 561 deletions(-) |
| Merging semaphore/semaphore |
| $ git merge semaphore/semaphore |
| Removed arch/alpha/kernel/semaphore.c |
| Removed arch/arm/kernel/semaphore.c |
| Removed arch/avr32/kernel/semaphore.c |
| Removed arch/cris/kernel/semaphore.c |
| Removed arch/frv/kernel/semaphore.c |
| Removed arch/h8300/kernel/semaphore.c |
| Removed arch/ia64/kernel/semaphore.c |
| Removed arch/m32r/kernel/semaphore.c |
| Removed arch/m68k/kernel/semaphore.c |
| Removed arch/m68k/lib/semaphore.S |
| Removed arch/m68knommu/kernel/semaphore.c |
| Removed arch/m68knommu/lib/semaphore.S |
| Removed arch/mips/kernel/semaphore.c |
| Removed arch/mn10300/kernel/semaphore.c |
| Removed arch/parisc/kernel/semaphore.c |
| Auto-merged arch/powerpc/kernel/ppc_ksyms.c |
| Removed arch/powerpc/kernel/semaphore.c |
| Removed arch/ppc/kernel/semaphore.c |
| Auto-merged arch/s390/kernel/Makefile |
| Removed arch/s390/kernel/semaphore.c |
| Removed arch/sh/kernel/semaphore.c |
| Removed arch/sparc/kernel/semaphore.c |
| Auto-merged arch/sparc/kernel/sparc_ksyms.c |
| Removed arch/sparc64/kernel/semaphore.c |
| Removed arch/v850/kernel/semaphore.c |
| Auto-merged arch/x86/Kconfig |
| Auto-merged arch/x86/kernel/x8664_ksyms_64.c |
| Auto-merged arch/x86/lib/thunk_64.S |
| Removed arch/xtensa/kernel/semaphore.c |
| Removed include/asm-arm/semaphore-helper.h |
| Removed include/asm-blackfin/semaphore-helper.h |
| Removed include/asm-cris/semaphore-helper.h |
| Removed include/asm-h8300/semaphore-helper.h |
| Removed include/asm-m68k/semaphore-helper.h |
| Removed include/asm-m68knommu/semaphore-helper.h |
| Removed include/asm-parisc/semaphore-helper.h |
| Removed include/asm-sh/semaphore-helper.h |
| CONFLICT (delete/modify): include/asm-x86/semaphore_32.h deleted in semaphore/semaphore and modified in HEAD. Version HEAD of include/asm-x86/semaphore_32.h left in tree. |
| CONFLICT (delete/modify): include/asm-x86/semaphore_64.h deleted in semaphore/semaphore and modified in HEAD. Version HEAD of include/asm-x86/semaphore_64.h left in tree. |
| Auto-merged kernel/Makefile |
| Auto-merged lib/Makefile |
| Removed lib/semaphore-sleepers.c |
| Automatic merge failed; fix conflicts and then commit the result. |
| $ git rm include/asm-x86/semaphore_32.h include/asm-x86/semaphore_64.h |
| $ git commit -v -a |
| $ git diff -M --stat --summary HEAD^.. |
| arch/alpha/kernel/Makefile | 2 +- |
| arch/alpha/kernel/alpha_ksyms.c | 9 - |
| arch/alpha/kernel/semaphore.c | 224 -------------------------- |
| arch/arm/kernel/Makefile | 2 +- |
| arch/arm/kernel/semaphore.c | 221 -------------------------- |
| arch/avr32/kernel/Makefile | 2 +- |
| arch/avr32/kernel/semaphore.c | 148 ----------------- |
| arch/blackfin/Kconfig | 4 - |
| arch/blackfin/kernel/bfin_ksyms.c | 5 - |
| arch/cris/kernel/Makefile | 3 +- |
| arch/cris/kernel/crisksyms.c | 7 - |
| arch/cris/kernel/semaphore.c | 129 --------------- |
| arch/frv/kernel/Makefile | 2 +- |
| arch/frv/kernel/frv_ksyms.c | 1 - |
| arch/frv/kernel/semaphore.c | 155 ------------------ |
| arch/h8300/kernel/Makefile | 2 +- |
| arch/h8300/kernel/h8300_ksyms.c | 1 - |
| arch/h8300/kernel/semaphore.c | 132 ---------------- |
| arch/ia64/kernel/Makefile | 2 +- |
| arch/ia64/kernel/ia64_ksyms.c | 6 - |
| arch/ia64/kernel/semaphore.c | 165 ------------------- |
| arch/m32r/kernel/Makefile | 2 +- |
| arch/m32r/kernel/m32r_ksyms.c | 5 - |
| arch/m32r/kernel/semaphore.c | 185 ---------------------- |
| arch/m68k/kernel/Makefile | 2 +- |
| arch/m68k/kernel/m68k_ksyms.c | 6 - |
| arch/m68k/kernel/semaphore.c | 132 ---------------- |
| arch/m68k/lib/Makefile | 2 +- |
| arch/m68k/lib/semaphore.S | 53 ------ |
| arch/m68knommu/kernel/Makefile | 2 +- |
| arch/m68knommu/kernel/m68k_ksyms.c | 6 - |
| arch/m68knommu/kernel/semaphore.c | 133 ---------------- |
| arch/m68knommu/lib/Makefile | 2 +- |
| arch/m68knommu/lib/semaphore.S | 66 -------- |
| arch/mips/kernel/Makefile | 2 +- |
| arch/mips/kernel/semaphore.c | 168 -------------------- |
| arch/mn10300/kernel/Makefile | 2 +- |
| arch/mn10300/kernel/semaphore.c | 149 ----------------- |
| arch/parisc/kernel/Makefile | 2 +- |
| arch/parisc/kernel/parisc_ksyms.c | 5 - |
| arch/parisc/kernel/semaphore.c | 102 ------------ |
| arch/powerpc/kernel/Makefile | 2 +- |
| arch/powerpc/kernel/ppc_ksyms.c | 1 - |
| arch/powerpc/kernel/semaphore.c | 135 ---------------- |
| arch/ppc/kernel/semaphore.c | 131 --------------- |
| arch/s390/kernel/Makefile | 2 +- |
| arch/s390/kernel/s390_ksyms.c | 7 - |
| arch/s390/kernel/semaphore.c | 108 ------------- |
| arch/sh/kernel/Makefile_32 | 2 +- |
| arch/sh/kernel/Makefile_64 | 2 +- |
| arch/sh/kernel/semaphore.c | 139 ---------------- |
| arch/sh/kernel/sh_ksyms_32.c | 7 - |
| arch/sh/kernel/sh_ksyms_64.c | 4 - |
| arch/sparc/kernel/Makefile | 2 +- |
| arch/sparc/kernel/semaphore.c | 155 ------------------ |
| arch/sparc/kernel/sparc_ksyms.c | 5 - |
| arch/sparc64/kernel/Makefile | 2 +- |
| arch/sparc64/kernel/semaphore.c | 254 ------------------------------ |
| arch/sparc64/kernel/sparc64_ksyms.c | 6 - |
| arch/um/Kconfig.i386 | 4 - |
| arch/um/Kconfig.x86_64 | 4 - |
| arch/um/sys-i386/ksyms.c | 12 -- |
| arch/um/sys-ppc/Makefile | 8 +- |
| arch/um/sys-x86_64/ksyms.c | 13 +-- |
| arch/v850/kernel/Makefile | 2 +- |
| arch/v850/kernel/semaphore.c | 166 ------------------- |
| arch/v850/kernel/v850_ksyms.c | 7 - |
| arch/x86/Kconfig | 3 - |
| arch/x86/kernel/i386_ksyms_32.c | 5 - |
| arch/x86/kernel/x8664_ksyms_64.c | 6 - |
| arch/x86/lib/semaphore_32.S | 83 ---------- |
| arch/x86/lib/thunk_64.S | 5 - |
| arch/xtensa/kernel/Makefile | 2 +- |
| arch/xtensa/kernel/semaphore.c | 226 -------------------------- |
| arch/xtensa/kernel/xtensa_ksyms.c | 9 - |
| drivers/acpi/osl.c | 89 +++-------- |
| include/asm-alpha/semaphore.h | 150 +----------------- |
| include/asm-arm/semaphore-helper.h | 84 ---------- |
| include/asm-arm/semaphore.h | 99 +------------ |
| include/asm-avr32/semaphore.h | 109 +------------- |
| include/asm-blackfin/semaphore-helper.h | 82 ---------- |
| include/asm-blackfin/semaphore.h | 106 +------------ |
| include/asm-cris/semaphore-helper.h | 78 --------- |
| include/asm-cris/semaphore.h | 134 +---------------- |
| include/asm-frv/semaphore.h | 156 +------------------ |
| include/asm-h8300/semaphore-helper.h | 85 ---------- |
| include/asm-h8300/semaphore.h | 191 +---------------------- |
| include/asm-ia64/semaphore.h | 100 +------------ |
| include/asm-m32r/semaphore.h | 145 +----------------- |
| include/asm-m68k/semaphore-helper.h | 142 ----------------- |
| include/asm-m68k/semaphore.h | 164 +------------------- |
| include/asm-m68knommu/semaphore-helper.h | 82 ---------- |
| include/asm-m68knommu/semaphore.h | 154 +------------------ |
| include/asm-mips/semaphore.h | 109 +------------- |
| include/asm-mn10300/semaphore.h | 170 +-------------------- |
| include/asm-parisc/semaphore-helper.h | 89 ----------- |
| include/asm-parisc/semaphore.h | 146 +----------------- |
| include/asm-powerpc/semaphore.h | 95 +----------- |
| include/asm-s390/semaphore.h | 108 +------------- |
| include/asm-sh/semaphore-helper.h | 89 ----------- |
| include/asm-sh/semaphore.h | 116 +-------------- |
| include/asm-sparc/semaphore.h | 193 +---------------------- |
| include/asm-sparc64/semaphore.h | 54 +------ |
| include/asm-um/semaphore.h | 7 +- |
| include/asm-v850/semaphore.h | 85 +---------- |
| include/asm-x86/semaphore.h | 6 +- |
| include/asm-x86/semaphore_32.h | 171 -------------------- |
| include/asm-x86/semaphore_64.h | 176 --------------------- |
| include/asm-xtensa/semaphore.h | 100 +------------ |
| include/linux/quota.h | 8 +- |
| include/linux/semaphore.h | 86 ++++++++++ |
| kernel/Makefile | 2 +- |
| kernel/semaphore.c | 207 ++++++++++++++++++++++++ |
| lib/Makefile | 1 - |
| lib/kernel_lock.c | 1 + |
| lib/semaphore-sleepers.c | 176 --------------------- |
| 116 files changed, 371 insertions(+), 7741 deletions(-) |
| delete mode 100644 arch/alpha/kernel/semaphore.c |
| delete mode 100644 arch/arm/kernel/semaphore.c |
| delete mode 100644 arch/avr32/kernel/semaphore.c |
| delete mode 100644 arch/cris/kernel/semaphore.c |
| delete mode 100644 arch/frv/kernel/semaphore.c |
| delete mode 100644 arch/h8300/kernel/semaphore.c |
| delete mode 100644 arch/ia64/kernel/semaphore.c |
| delete mode 100644 arch/m32r/kernel/semaphore.c |
| delete mode 100644 arch/m68k/kernel/semaphore.c |
| delete mode 100644 arch/m68k/lib/semaphore.S |
| delete mode 100644 arch/m68knommu/kernel/semaphore.c |
| delete mode 100644 arch/m68knommu/lib/semaphore.S |
| delete mode 100644 arch/mips/kernel/semaphore.c |
| delete mode 100644 arch/mn10300/kernel/semaphore.c |
| delete mode 100644 arch/parisc/kernel/semaphore.c |
| delete mode 100644 arch/powerpc/kernel/semaphore.c |
| delete mode 100644 arch/ppc/kernel/semaphore.c |
| delete mode 100644 arch/s390/kernel/semaphore.c |
| delete mode 100644 arch/sh/kernel/semaphore.c |
| delete mode 100644 arch/sparc/kernel/semaphore.c |
| delete mode 100644 arch/sparc64/kernel/semaphore.c |
| delete mode 100644 arch/v850/kernel/semaphore.c |
| delete mode 100644 arch/xtensa/kernel/semaphore.c |
| delete mode 100644 include/asm-arm/semaphore-helper.h |
| delete mode 100644 include/asm-blackfin/semaphore-helper.h |
| delete mode 100644 include/asm-cris/semaphore-helper.h |
| delete mode 100644 include/asm-h8300/semaphore-helper.h |
| delete mode 100644 include/asm-m68k/semaphore-helper.h |
| delete mode 100644 include/asm-m68knommu/semaphore-helper.h |
| delete mode 100644 include/asm-parisc/semaphore-helper.h |
| delete mode 100644 include/asm-sh/semaphore-helper.h |
| delete mode 100644 include/asm-x86/semaphore_32.h |
| delete mode 100644 include/asm-x86/semaphore_64.h |
| create mode 100644 include/linux/semaphore.h |
| create mode 100644 kernel/semaphore.c |
| delete mode 100644 lib/semaphore-sleepers.c |
| Merging quilt/ldp |
| $ git merge quilt/ldp |
| Auto-merged drivers/hid/usbhid/hid-quirks.c |
| Auto-merged drivers/media/video/Kconfig |
| Auto-merged drivers/media/video/Makefile |
| Auto-merged drivers/misc/Kconfig |
| Auto-merged drivers/misc/Makefile |
| Auto-merged drivers/net/Kconfig |
| Auto-merged drivers/net/Makefile |
| Auto-merged fs/Kconfig |
| Merge made by recursive. |
| drivers/Kconfig | 2 + |
| drivers/Makefile | 2 + |
| drivers/hid/usbhid/hid-quirks.c | 2 + |
| drivers/input/misc/Kconfig | 12 + |
| drivers/input/misc/Makefile | 1 + |
| drivers/input/misc/appleir.c | 360 + |
| drivers/media/dvb/Kconfig | 2 + |
| drivers/media/dvb/Makefile | 2 +- |
| drivers/media/dvb/firesat/Kconfig | 11 + |
| drivers/media/dvb/firesat/Makefile | 12 + |
| drivers/media/dvb/firesat/avc_api.c | 813 + |
| drivers/media/dvb/firesat/avc_api.h | 380 + |
| drivers/media/dvb/firesat/cmp.c | 230 + |
| drivers/media/dvb/firesat/cmp.h | 9 + |
| drivers/media/dvb/firesat/firesat-ci.c | 95 + |
| drivers/media/dvb/firesat/firesat-ci.h | 9 + |
| drivers/media/dvb/firesat/firesat-rc.c | 82 + |
| drivers/media/dvb/firesat/firesat-rc.h | 9 + |
| drivers/media/dvb/firesat/firesat.h | 85 + |
| drivers/media/dvb/firesat/firesat_1394.c | 468 + |
| drivers/media/dvb/firesat/firesat_dvb.c | 325 + |
| drivers/media/dvb/firesat/firesat_fe.c | 263 + |
| drivers/media/video/Kconfig | 1 + |
| drivers/media/video/Makefile | 2 + |
| drivers/media/video/go7007/Kconfig | 14 + |
| drivers/media/video/go7007/Makefile | 17 + |
| drivers/media/video/go7007/go7007-driver.c | 693 + |
| drivers/media/video/go7007/go7007-fw.c | 1643 ++ |
| drivers/media/video/go7007/go7007-i2c.c | 309 + |
| drivers/media/video/go7007/go7007-priv.h | 279 + |
| drivers/media/video/go7007/go7007-usb.c | 1229 + |
| drivers/media/video/go7007/go7007-v4l2.c | 1516 + |
| drivers/media/video/go7007/go7007.h | 120 + |
| drivers/media/video/go7007/saa7134-go7007.c | 484 + |
| drivers/media/video/go7007/snd-go7007.c | 315 + |
| drivers/media/video/go7007/wis-i2c.h | 55 + |
| drivers/media/video/go7007/wis-ov7640.c | 146 + |
| drivers/media/video/go7007/wis-saa7113.c | 378 + |
| drivers/media/video/go7007/wis-saa7115.c | 507 + |
| drivers/media/video/go7007/wis-sony-tuner.c | 757 + |
| drivers/media/video/go7007/wis-tw2804.c | 383 + |
| drivers/media/video/go7007/wis-tw9903.c | 378 + |
| drivers/media/video/go7007/wis-uda1342.c | 136 + |
| drivers/misc/Kconfig | 12 + |
| drivers/misc/Makefile | 2 + |
| drivers/misc/aectc/Makefile | 1 + |
| drivers/misc/aectc/aec_tc.c | 349 + |
| drivers/misc/aectc/aectc.h | 18 + |
| drivers/misc/aectc/read.c | 63 + |
| drivers/misc/aectc/write.c | 64 + |
| drivers/misc/me4000.c | 5435 ++++ |
| drivers/misc/me4000.h | 1014 + |
| drivers/misc/xilinx_firm.h |15416 ++++++++++ |
| drivers/net/Kconfig | 32 + |
| drivers/net/Makefile | 2 + |
| drivers/net/et131x/MODULE-PARAMETER.txt | 36 + |
| drivers/net/et131x/Makefile | 18 + |
| drivers/net/et131x/et1310_address_map.h | 2399 ++ |
| drivers/net/et131x/et1310_eeprom.c | 480 + |
| drivers/net/et131x/et1310_eeprom.h | 89 + |
| drivers/net/et131x/et1310_jagcore.c | 222 + |
| drivers/net/et131x/et1310_jagcore.h | 112 + |
| drivers/net/et131x/et1310_mac.c | 800 + |
| drivers/net/et131x/et1310_mac.h | 93 + |
| drivers/net/et131x/et1310_phy.c | 1297 + |
| drivers/net/et131x/et1310_phy.h | 910 + |
| drivers/net/et131x/et1310_pm.c | 209 + |
| drivers/net/et131x/et1310_pm.h | 126 + |
| drivers/net/et131x/et1310_rx.c | 1401 + |
| drivers/net/et131x/et1310_rx.h | 373 + |
| drivers/net/et131x/et1310_tx.c | 1541 + |
| drivers/net/et131x/et1310_tx.h | 242 + |
| drivers/net/et131x/et131x_adapter.h | 347 + |
| drivers/net/et131x/et131x_config.c | 312 + |
| drivers/net/et131x/et131x_config.h | 67 + |
| drivers/net/et131x/et131x_debug.c | 218 + |
| drivers/net/et131x/et131x_debug.h | 202 + |
| drivers/net/et131x/et131x_defs.h | 128 + |
| drivers/net/et131x/et131x_initpci.c | 1047 + |
| drivers/net/et131x/et131x_initpci.h | 73 + |
| drivers/net/et131x/et131x_isr.c | 492 + |
| drivers/net/et131x/et131x_isr.h | 65 + |
| drivers/net/et131x/et131x_netdev.c | 868 + |
| drivers/net/et131x/et131x_netdev.h | 64 + |
| drivers/net/et131x/et131x_version.h | 86 + |
| drivers/net/slicoss/Makefile | 1 + |
| drivers/net/slicoss/gbdownload.h | 8215 ++++++ |
| drivers/net/slicoss/gbrcvucode.h | 239 + |
| drivers/net/slicoss/oasisdbgdownload.h | 6850 +++++ |
| drivers/net/slicoss/oasisdownload.h | 6848 +++++ |
| drivers/net/slicoss/oasisrcvucode.h | 205 + |
| drivers/net/slicoss/slic.h | 619 + |
| drivers/net/slicoss/slic_os.h | 150 + |
| drivers/net/slicoss/slicbuild.h | 97 + |
| drivers/net/slicoss/slicdbg.h | 100 + |
| drivers/net/slicoss/slicdump.h | 282 + |
| drivers/net/slicoss/slichw.h | 855 + |
| drivers/net/slicoss/slicinc.h | 215 + |
| drivers/net/slicoss/slicoss.c | 6160 ++++ |
| drivers/usb/Kconfig | 2 + |
| drivers/usb/Makefile | 1 + |
| drivers/usb/host/Kconfig | 14 + |
| drivers/usb/host/Makefile | 1 + |
| drivers/usb/host/hwa-hc.c | 951 + |
| drivers/usb/image/Kconfig | 9 + |
| drivers/usb/image/Makefile | 1 + |
| drivers/usb/image/f2255usb.h |40334 +++++++++++++++++++++++++++ |
| drivers/usb/image/s2255drv.c | 2802 ++ |
| drivers/usb/wusbcore/Kconfig | 17 + |
| drivers/usb/wusbcore/Makefile | 21 + |
| drivers/usb/wusbcore/cbaf.c | 783 + |
| drivers/usb/wusbcore/crypto.c | 544 + |
| drivers/usb/wusbcore/dev-sysfs.c | 218 + |
| drivers/usb/wusbcore/devconnect.c | 1332 + |
| drivers/usb/wusbcore/mmc.c | 334 + |
| drivers/usb/wusbcore/pal.c | 39 + |
| drivers/usb/wusbcore/reservation.c | 127 + |
| drivers/usb/wusbcore/rh.c | 493 + |
| drivers/usb/wusbcore/security.c | 545 + |
| drivers/usb/wusbcore/wa-hc.c | 83 + |
| drivers/usb/wusbcore/wa-hc.h | 420 + |
| drivers/usb/wusbcore/wa-nep.c | 331 + |
| drivers/usb/wusbcore/wa-rpipe.c | 567 + |
| drivers/usb/wusbcore/wa-xfer.c | 1762 ++ |
| drivers/usb/wusbcore/wusbhc.c | 436 + |
| drivers/usb/wusbcore/wusbhc.h | 522 + |
| drivers/uwb/Kconfig | 92 + |
| drivers/uwb/Makefile | 31 + |
| drivers/uwb/address.c | 380 + |
| drivers/uwb/beacon.c | 725 + |
| drivers/uwb/driver.c | 308 + |
| drivers/uwb/drp-avail.c | 288 + |
| drivers/uwb/drp-ie.c | 230 + |
| drivers/uwb/drp.c | 406 + |
| drivers/uwb/est.c | 425 + |
| drivers/uwb/hwa-rc.c | 927 + |
| drivers/uwb/i1480/Makefile | 2 + |
| drivers/uwb/i1480/dfu/Makefile | 9 + |
| drivers/uwb/i1480/dfu/dfu.c | 286 + |
| drivers/uwb/i1480/dfu/i1480-dfu.h | 264 + |
| drivers/uwb/i1480/dfu/mac.c | 530 + |
| drivers/uwb/i1480/dfu/phy.c | 203 + |
| drivers/uwb/i1480/dfu/usb.c | 516 + |
| drivers/uwb/i1480/i1480-est.c | 99 + |
| drivers/uwb/i1480/i1480-wlp.h | 160 + |
| drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + |
| drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 269 + |
| drivers/uwb/i1480/i1480u-wlp/lc.c | 430 + |
| drivers/uwb/i1480/i1480u-wlp/netdev.c | 368 + |
| drivers/uwb/i1480/i1480u-wlp/rx.c | 492 + |
| drivers/uwb/i1480/i1480u-wlp/sysfs.c | 446 + |
| drivers/uwb/i1480/i1480u-wlp/tx.c | 641 + |
| drivers/uwb/ie.c | 591 + |
| drivers/uwb/lc-dev.c | 703 + |
| drivers/uwb/lc-rc.c | 562 + |
| drivers/uwb/neh.c | 616 + |
| drivers/uwb/pal.c | 71 + |
| drivers/uwb/reset.c | 328 + |
| drivers/uwb/rsv.c | 607 + |
| drivers/uwb/scan.c | 160 + |
| drivers/uwb/umc-bus.c | 186 + |
| drivers/uwb/umc-dev.c | 103 + |
| drivers/uwb/umc-drv.c | 31 + |
| drivers/uwb/uwb-debug.c | 306 + |
| drivers/uwb/uwb-internal.h | 292 + |
| drivers/uwb/uwbd.c | 428 + |
| drivers/uwb/whc-rc.c | 564 + |
| drivers/uwb/whci.c | 296 + |
| drivers/uwb/wlp/Makefile | 10 + |
| drivers/uwb/wlp/driver.c | 43 + |
| drivers/uwb/wlp/eda.c | 452 + |
| drivers/uwb/wlp/messages.c | 1945 ++ |
| drivers/uwb/wlp/sysfs.c | 715 + |
| drivers/uwb/wlp/txrx.c | 374 + |
| drivers/uwb/wlp/wlp-internal.h | 228 + |
| drivers/uwb/wlp/wlp-lc.c | 565 + |
| drivers/uwb/wlp/wss-lc.c | 1056 + |
| fs/Kconfig | 9 + |
| fs/Makefile | 1 + |
| fs/novfs/Makefile | 19 + |
| fs/novfs/commands.h | 1089 + |
| fs/novfs/daemon.c | 2444 ++ |
| fs/novfs/file.c | 2225 ++ |
| fs/novfs/inode.c | 5634 ++++ |
| fs/novfs/nwcapi.c | 2537 ++ |
| fs/novfs/nwcapi.h | 2213 ++ |
| fs/novfs/nwerror.h | 658 + |
| fs/novfs/proc.c | 152 + |
| fs/novfs/profile.c | 687 + |
| fs/novfs/scope.c | 738 + |
| fs/novfs/vfs.h | 447 + |
| 191 files changed, 171405 insertions(+), 1 deletions(-) |
| create mode 100644 drivers/input/misc/appleir.c |
| create mode 100644 drivers/media/dvb/firesat/Kconfig |
| create mode 100644 drivers/media/dvb/firesat/Makefile |
| create mode 100644 drivers/media/dvb/firesat/avc_api.c |
| create mode 100644 drivers/media/dvb/firesat/avc_api.h |
| create mode 100644 drivers/media/dvb/firesat/cmp.c |
| create mode 100644 drivers/media/dvb/firesat/cmp.h |
| create mode 100644 drivers/media/dvb/firesat/firesat-ci.c |
| create mode 100644 drivers/media/dvb/firesat/firesat-ci.h |
| create mode 100644 drivers/media/dvb/firesat/firesat-rc.c |
| create mode 100644 drivers/media/dvb/firesat/firesat-rc.h |
| create mode 100644 drivers/media/dvb/firesat/firesat.h |
| create mode 100644 drivers/media/dvb/firesat/firesat_1394.c |
| create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c |
| create mode 100644 drivers/media/dvb/firesat/firesat_fe.c |
| create mode 100644 drivers/media/video/go7007/Kconfig |
| create mode 100644 drivers/media/video/go7007/Makefile |
| create mode 100644 drivers/media/video/go7007/go7007-driver.c |
| create mode 100644 drivers/media/video/go7007/go7007-fw.c |
| create mode 100644 drivers/media/video/go7007/go7007-i2c.c |
| create mode 100644 drivers/media/video/go7007/go7007-priv.h |
| create mode 100644 drivers/media/video/go7007/go7007-usb.c |
| create mode 100644 drivers/media/video/go7007/go7007-v4l2.c |
| create mode 100644 drivers/media/video/go7007/go7007.h |
| create mode 100644 drivers/media/video/go7007/saa7134-go7007.c |
| create mode 100644 drivers/media/video/go7007/snd-go7007.c |
| create mode 100644 drivers/media/video/go7007/wis-i2c.h |
| create mode 100644 drivers/media/video/go7007/wis-ov7640.c |
| create mode 100644 drivers/media/video/go7007/wis-saa7113.c |
| create mode 100644 drivers/media/video/go7007/wis-saa7115.c |
| create mode 100644 drivers/media/video/go7007/wis-sony-tuner.c |
| create mode 100644 drivers/media/video/go7007/wis-tw2804.c |
| create mode 100644 drivers/media/video/go7007/wis-tw9903.c |
| create mode 100644 drivers/media/video/go7007/wis-uda1342.c |
| create mode 100644 drivers/misc/aectc/Makefile |
| create mode 100644 drivers/misc/aectc/aec_tc.c |
| create mode 100644 drivers/misc/aectc/aectc.h |
| create mode 100644 drivers/misc/aectc/read.c |
| create mode 100644 drivers/misc/aectc/write.c |
| create mode 100644 drivers/misc/me4000.c |
| create mode 100644 drivers/misc/me4000.h |
| create mode 100644 drivers/misc/xilinx_firm.h |
| create mode 100644 drivers/net/et131x/MODULE-PARAMETER.txt |
| create mode 100644 drivers/net/et131x/Makefile |
| create mode 100644 drivers/net/et131x/et1310_address_map.h |
| create mode 100644 drivers/net/et131x/et1310_eeprom.c |
| create mode 100644 drivers/net/et131x/et1310_eeprom.h |
| create mode 100644 drivers/net/et131x/et1310_jagcore.c |
| create mode 100644 drivers/net/et131x/et1310_jagcore.h |
| create mode 100644 drivers/net/et131x/et1310_mac.c |
| create mode 100644 drivers/net/et131x/et1310_mac.h |
| create mode 100644 drivers/net/et131x/et1310_phy.c |
| create mode 100644 drivers/net/et131x/et1310_phy.h |
| create mode 100644 drivers/net/et131x/et1310_pm.c |
| create mode 100644 drivers/net/et131x/et1310_pm.h |
| create mode 100644 drivers/net/et131x/et1310_rx.c |
| create mode 100644 drivers/net/et131x/et1310_rx.h |
| create mode 100644 drivers/net/et131x/et1310_tx.c |
| create mode 100644 drivers/net/et131x/et1310_tx.h |
| create mode 100644 drivers/net/et131x/et131x_adapter.h |
| create mode 100644 drivers/net/et131x/et131x_config.c |
| create mode 100644 drivers/net/et131x/et131x_config.h |
| create mode 100644 drivers/net/et131x/et131x_debug.c |
| create mode 100644 drivers/net/et131x/et131x_debug.h |
| create mode 100644 drivers/net/et131x/et131x_defs.h |
| create mode 100644 drivers/net/et131x/et131x_initpci.c |
| create mode 100644 drivers/net/et131x/et131x_initpci.h |
| create mode 100644 drivers/net/et131x/et131x_isr.c |
| create mode 100644 drivers/net/et131x/et131x_isr.h |
| create mode 100644 drivers/net/et131x/et131x_netdev.c |
| create mode 100644 drivers/net/et131x/et131x_netdev.h |
| create mode 100644 drivers/net/et131x/et131x_version.h |
| create mode 100644 drivers/net/slicoss/Makefile |
| create mode 100644 drivers/net/slicoss/gbdownload.h |
| create mode 100644 drivers/net/slicoss/gbrcvucode.h |
| create mode 100644 drivers/net/slicoss/oasisdbgdownload.h |
| create mode 100644 drivers/net/slicoss/oasisdownload.h |
| create mode 100644 drivers/net/slicoss/oasisrcvucode.h |
| create mode 100644 drivers/net/slicoss/slic.h |
| create mode 100644 drivers/net/slicoss/slic_os.h |
| create mode 100644 drivers/net/slicoss/slicbuild.h |
| create mode 100644 drivers/net/slicoss/slicdbg.h |
| create mode 100644 drivers/net/slicoss/slicdump.h |
| create mode 100644 drivers/net/slicoss/slichw.h |
| create mode 100644 drivers/net/slicoss/slicinc.h |
| create mode 100644 drivers/net/slicoss/slicoss.c |
| create mode 100644 drivers/usb/host/hwa-hc.c |
| create mode 100644 drivers/usb/image/f2255usb.h |
| create mode 100644 drivers/usb/image/s2255drv.c |
| create mode 100644 drivers/usb/wusbcore/Kconfig |
| create mode 100644 drivers/usb/wusbcore/Makefile |
| create mode 100644 drivers/usb/wusbcore/cbaf.c |
| create mode 100644 drivers/usb/wusbcore/crypto.c |
| create mode 100644 drivers/usb/wusbcore/dev-sysfs.c |
| create mode 100644 drivers/usb/wusbcore/devconnect.c |
| create mode 100644 drivers/usb/wusbcore/mmc.c |
| create mode 100644 drivers/usb/wusbcore/pal.c |
| create mode 100644 drivers/usb/wusbcore/reservation.c |
| create mode 100644 drivers/usb/wusbcore/rh.c |
| create mode 100644 drivers/usb/wusbcore/security.c |
| create mode 100644 drivers/usb/wusbcore/wa-hc.c |
| create mode 100644 drivers/usb/wusbcore/wa-hc.h |
| create mode 100644 drivers/usb/wusbcore/wa-nep.c |
| create mode 100644 drivers/usb/wusbcore/wa-rpipe.c |
| create mode 100644 drivers/usb/wusbcore/wa-xfer.c |
| create mode 100644 drivers/usb/wusbcore/wusbhc.c |
| create mode 100644 drivers/usb/wusbcore/wusbhc.h |
| create mode 100644 drivers/uwb/Kconfig |
| create mode 100644 drivers/uwb/Makefile |
| create mode 100644 drivers/uwb/address.c |
| create mode 100644 drivers/uwb/beacon.c |
| create mode 100644 drivers/uwb/driver.c |
| create mode 100644 drivers/uwb/drp-avail.c |
| create mode 100644 drivers/uwb/drp-ie.c |
| create mode 100644 drivers/uwb/drp.c |
| create mode 100644 drivers/uwb/est.c |
| create mode 100644 drivers/uwb/hwa-rc.c |
| create mode 100644 drivers/uwb/i1480/Makefile |
| create mode 100644 drivers/uwb/i1480/dfu/Makefile |
| create mode 100644 drivers/uwb/i1480/dfu/dfu.c |
| create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h |
| create mode 100644 drivers/uwb/i1480/dfu/mac.c |
| create mode 100644 drivers/uwb/i1480/dfu/phy.c |
| create mode 100644 drivers/uwb/i1480/dfu/usb.c |
| create mode 100644 drivers/uwb/i1480/i1480-est.c |
| create mode 100644 drivers/uwb/i1480/i1480-wlp.h |
| create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile |
| create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h |
| create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c |
| create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c |
| create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c |
| create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c |
| create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c |
| create mode 100644 drivers/uwb/ie.c |
| create mode 100644 drivers/uwb/lc-dev.c |
| create mode 100644 drivers/uwb/lc-rc.c |
| create mode 100644 drivers/uwb/neh.c |
| create mode 100644 drivers/uwb/pal.c |
| create mode 100644 drivers/uwb/reset.c |
| create mode 100644 drivers/uwb/rsv.c |
| create mode 100644 drivers/uwb/scan.c |
| create mode 100644 drivers/uwb/umc-bus.c |
| create mode 100644 drivers/uwb/umc-dev.c |
| create mode 100644 drivers/uwb/umc-drv.c |
| create mode 100644 drivers/uwb/uwb-debug.c |
| create mode 100644 drivers/uwb/uwb-internal.h |
| create mode 100644 drivers/uwb/uwbd.c |
| create mode 100644 drivers/uwb/whc-rc.c |
| create mode 100644 drivers/uwb/whci.c |
| create mode 100644 drivers/uwb/wlp/Makefile |
| create mode 100644 drivers/uwb/wlp/driver.c |
| create mode 100644 drivers/uwb/wlp/eda.c |
| create mode 100644 drivers/uwb/wlp/messages.c |
| create mode 100644 drivers/uwb/wlp/sysfs.c |
| create mode 100644 drivers/uwb/wlp/txrx.c |
| create mode 100644 drivers/uwb/wlp/wlp-internal.h |
| create mode 100644 drivers/uwb/wlp/wlp-lc.c |
| create mode 100644 drivers/uwb/wlp/wss-lc.c |
| create mode 100644 fs/novfs/Makefile |
| create mode 100644 fs/novfs/commands.h |
| create mode 100644 fs/novfs/daemon.c |
| create mode 100644 fs/novfs/file.c |
| create mode 100644 fs/novfs/inode.c |
| create mode 100644 fs/novfs/nwcapi.c |
| create mode 100644 fs/novfs/nwcapi.h |
| create mode 100644 fs/novfs/nwerror.h |
| create mode 100644 fs/novfs/proc.c |
| create mode 100644 fs/novfs/profile.c |
| create mode 100644 fs/novfs/scope.c |
| create mode 100644 fs/novfs/vfs.h |
| Applying parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP |
| Applying nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP |
| Applying smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP |
| Applying Fix MAX_ORDER config problem |
