1. 24 Mar, 2006 32 commits
  2. 23 Mar, 2006 8 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 · b6585ded
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (36 commits)
        [PATCH] hwmon: add required idr locking
        [PATCH] I2C: hwmon: Rename register parameters
        [PATCH] I2C: Drop unneeded i2c-dev.h includes
        [PATCH] I2C: i2c-ixp4xx: Add hwmon class
        [PATCH] I2C: i2c-piix4: Add Broadcom HT-1000 support
        [PATCH] I2C: i2c-amd756-s4882: Improve static mutex initialization
        [PATCH] I2C: i2c-ali1535: Drop redundant mutex
        [PATCH] i2c: Cleanup isp1301_omap
        [PATCH] i2c: Fix i2c-ite name initialization
        [PATCH] i2c: Drop the i2c-frodo bus driver
        [PATCH] i2c: Optimize core_lists mutex usage
        [PATCH] w83781d: Don't reset the chip by default
        [PATCH] w83781d: Document the alarm and beep bits
        [PATCH] w83627ehf: Refactor the sysfs interface
        [PATCH] hwmon: Support the Pentium M VID code
        [PATCH] hwmon: Add support for the Winbond W83687THF
        [PATCH] hwmon: f71805f semaphore to mutex conversions
        [PATCH] hwmon: Semaphore to mutex conversions
        [PATCH] i2c: Semaphore to mutex conversions, part 3
        [PATCH] i2c: Semaphore to mutex conversions, part 2
        ...
      b6585ded
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · a3ea9b58
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (49 commits)
        [PATCH] acpiphp: fix acpi_path_name
        [PATCH] ibmphp: remove TRUE and FALSE
        [PATCH] PCI Hotplug: add common acpi functions to core
        [PATCH] PCI: kzalloc() conversion in drivers/pci
        [PATCH] acpiphp: Scan slots under the nested P2P bridge
        [PATCH] PCI Hotplug: SN: Fix cleanup on hotplug removal of PPB
        [PATCH] shpchp: cleanup bus speed handling
        [PATCH] PCI: fix pci_request_region[s] arg
        [PATCH] PCI: Provide a boot parameter to disable MSI
        [PATCH] PCI: the scheduled removal of PCI_LEGACY_PROC
        [PATCH] PCI: cpqphp_ctrl.c: board_replaced(): remove dead code
        [PATCH] acpiphp: fix bridge handle
        [PATCH] acpiphp - slot management fix - V4
        [PATCH] acpi: remove dock event handling from ibm_acpi
        [PATCH] acpiphp: add dock event handling
        [PATCH] acpi: export acpi_bus_trim
        [PATCH] acpiphp: add new bus to acpi
        [PATCH] PCI: Move pci_dev_put outside a spinlock
        [PATCH] PCI: PCI/Cardbus cards hidden, needs pci=assign-busses to fix
        [PATCH] PCI: fix problems with MSI-X on ia64
        ...
      a3ea9b58
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 554f593d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [TG3]: Update driver version and reldate.
        [TG3]: Add 5755 nvram support
        [TG3]: Add 5755 support
        [IPV6]: ip6_xmit: remove unnecessary NULL ptr check
        [NET_SCHED]: cls_u32: remove unnecessary NULL-ptr check
        [IPV4]: Add fib rule netlink notifications
        [BNX2]: Update version and reldate
        [BNX2]: Separate tx producer and consumer fields
        [BNX2]: Move .h files to bnx2.c
        [BNX2]: Combine small mem allocations
        [BNX2]: Fix link change handling
        [PKTGEN]: Add MPLS extension.
      554f593d
    • Linus Torvalds's avatar
      Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 · debf798b
      Linus Torvalds authored
      * git://oss.sgi.com:8090/oss/git/xfs-2.6: (71 commits)
        [XFS] Sync up one/two other minor changes missed in previous merges.
        [XFS] Reenable the noikeep (delete inode cluster space) option by default.
        [XFS] Check that a page has dirty buffers before finding it acceptable for
        [XFS] Fixup naming inconsistencies found by Pekka Enberg and one from Jan
        [XFS] Explain the race closed by the addition of vn_iowait() to the start
        [XFS] Fixing the error caused by the conflict between DIO Write's
        [XFS] Fixing KDB's xrwtrc command, also added the current process id into
        [XFS] Fix compiler warning from xfs_file_compat_invis_ioctl prototype. 
        [XFS] remove bogus INT_GET for u8 variables in xfs_dir_leaf.c 
        [XFS] endianess annotations for xfs_da_node_hdr_t 
        [XFS] endianess annotations for xfs_da_node_entry_t 
        [XFS] store xfs_attr_inactive_list_t in native endian 
        [XFS] store xfs_attr_sf_sort in native endian 
        [XFS] endianess annotations for xfs_attr_shortform_t 
        [XFS] endianess annotations for xfs_attr_leaf_name_remote_t 
        [XFS] endianess annotations for xfs_attr_leaf_name_local_t 
        [XFS] endianess annotations for xfs_attr_leaf_entry_t 
        [XFS] endianess annotations for xfs_attr_leaf_hdr_t 
        [XFS] remove bogus INT_GET on u8 variables in xfs_dir2_block.c 
        [XFS] endianess annotations for xfs_da_blkinfo_t 
        ...
      debf798b
    • MUNEDA Takahiro's avatar
      [PATCH] acpiphp: fix acpi_path_name · b2e6e3ba
      MUNEDA Takahiro authored
      I encountered the problem that the insmod of the acpiphp
      fails because of the mis-freeing of the memory.
      
      I tested this patch on my tiger4 box.
      Signed-off-by: default avatarMUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      b2e6e3ba
    • Kristen Accardi's avatar
      [PATCH] ibmphp: remove TRUE and FALSE · dc6712d1
      Kristen Accardi authored
      This patch removes the defines TRUE and FALSE and just uses 0 or 1.
      Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      dc6712d1
    • Kristen Accardi's avatar
      [PATCH] PCI Hotplug: add common acpi functions to core · 783c49fc
      Kristen Accardi authored
      shpchprm_acpi.c and pciehprm_acpi.c are nearly identical.  In addition,
      there are functions in both these files that are also in acpiphp_glue.c.
      This patch will remove duplicate functions from shpchp, pciehp, and
      acpiphp and move this functionality to pci_hotplug, as it is not
      hardware specific.  Get rid of shpchprm* and pciehprm* files since they
      are no longer needed.  shpchprm_nonacpi.c and pciehprm_nonacpi.c are
      identical, as well as shpchprm_legacy.c and can be replaced with a
      macro.
      
      This patch also changes acpiphp to use the common hpp code.
      Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      783c49fc
    • Eric Sesterhenn's avatar
      [PATCH] PCI: kzalloc() conversion in drivers/pci · f5afe806
      Eric Sesterhenn authored
      this patch converts drivers/pci to kzalloc usage.
      Compile tested with allyes config.
      Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      f5afe806