Linus Torvalds 0c93ea4064 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 ...

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)
  Dynamic debug: fix pr_fmt() build error
  Dynamic debug: allow simple quoting of words
  dynamic debug: update docs
  dynamic debug: combine dprintk and dynamic printk
  sysfs: fix some bin_vm_ops errors
  kobject: don't block for each kobject_uevent
  sysfs: only allow one scheduled removal callback per kobj
  Driver core: Fix device_move() vs. dpm list ordering, v2
  Driver core: some cleanup on drivers/base/sys.c
  Driver core: implement uevent suppress in kobject
  vcs: hook sysfs devices into object lifetime instead of "binding"
  driver core: fix passing platform_data
  driver core: move platform_data into platform_device
  sysfs: don't block indefinitely for unmapped files.
  driver core: move knode_bus into private structure
  driver core: move knode_driver into private structure
  driver core: move klist_children into private structure
  driver core: create a private portion of struct device
  driver core: remove polling for driver_probe_done(v5)
  sysfs: reference sysfs_dirent from sysfs inodes
  ...

Fixed conflicts in drivers/sh/maple/maple.c manually

2009-03-26 11:17:04 -07:00

..

aec62xx.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

ali14xx.c

ide: remove useless subdirs from drivers/ide/

2008-10-21 20:57:23 +02:00

alim15x3.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

amd74xx.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

at91_ide.c

ide: add at91_ide driver

2009-03-05 16:10:58 +01:00

atiixp.c

ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS

2009-03-24 23:22:52 +01:00

au1xxx-ide.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

buddha.c

ide: remove useless subdirs from drivers/ide/

2008-10-21 20:57:23 +02:00

cmd64x.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

cmd640.c

cmd640: use ide_get_pair_dev() helper

2009-01-06 17:20:55 +01:00

cs5520.c

ide: remove pciirq argument from ide_pci_setup_ports()

2009-03-24 23:22:53 +01:00

cs5530.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

cs5535.c

ide: remove useless subdirs from drivers/ide/

2008-10-21 20:57:23 +02:00

cs5536.c

ide: add CS5536 host driver (v3)

2009-02-02 20:12:23 +01:00

cy82c693.c

ide: remove HWIF() macro

2009-01-06 17:20:52 +01:00

delkin_cb.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

dtc2278.c

ide: remove useless subdirs from drivers/ide/

2008-10-21 20:57:23 +02:00

falconide.c

ide: fix Falcon IDE breakage

2009-01-19 13:46:56 +01:00

gayle.c

gayle: set IDE_HFLAG_SERIALIZE explictly

2008-12-29 20:27:33 +01:00

hpt366.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

ht6560b.c

ide: remove useless subdirs from drivers/ide/

2008-10-21 20:57:23 +02:00

icside.c

icside: fix PCB version 6 support (v2)

2009-02-02 20:12:23 +01:00

ide_arm.c

[ARM] clps7500: remove support

2008-11-27 12:38:11 +00:00

ide_platform.c

ide: remove useless subdirs from drivers/ide/

2008-10-21 20:57:23 +02:00

ide-4drives.c

ide: remove useless subdirs from drivers/ide/

2008-10-21 20:57:23 +02:00

ide-acpi.c

ide-acpi: remove taskfile_load_raw()

2009-03-24 23:22:42 +01:00

ide-atapi.c

ide: move ide_read_bcount_and_ireason() to ide-atapi.c

2009-03-24 23:22:46 +01:00

ide-cd_ioctl.c

ide: remove IDE_AFLAG_NO_DOORLOCKING

2008-10-17 18:09:11 +02:00

ide-cd_verbose.c

block: replace sizeof(rq->cmd) with BLK_MAX_CDB

2008-04-29 14:48:55 +02:00

ide-cd.c

ide: remove ide_do_drive_cmd()

2009-03-24 23:22:44 +01:00

ide-cd.h

ide: fix refcounting in device drivers

2009-02-25 20:28:24 +01:00

ide-cs.c

pcmcia: add another pata/ide ID

2008-11-09 21:35:36 +01:00

ide-devsets.c

ide: move device settings code to ide-devsets.c

2009-03-24 23:22:44 +01:00

ide-disk_ioctl.c

[PATCH] switch ide_disk_ops ->ioctl() to sane prototype

2008-10-21 07:47:30 -04:00

ide-disk_proc.c

ide: NULL noise: drivers/ide/ide-*.c

2009-03-05 16:10:56 +01:00

ide-disk.c

ide: can't use SSD/non-rotational queue flag for all CFA devices

2009-01-14 19:19:03 +01:00

ide-disk.h

[PATCH] switch ide_disk_ops ->ioctl() to sane prototype

2008-10-21 07:47:30 -04:00

ide-dma-sff.c

ide-dma-sff: factor out ide_dma_sff_write_status()

2009-01-06 17:21:02 +01:00

ide-dma.c

ide: move ide_dma_timeout_retry() to ide-dma.c

2009-03-24 23:22:43 +01:00

ide-eh.c

ide: move error handling code to ide-eh.c (v2)

2009-03-24 23:22:47 +01:00

ide-floppy_ioctl.c

ide-floppy: allocate only toplevel packet commands

2009-01-02 16:12:51 +01:00

ide-floppy_proc.c

ide: NULL noise: drivers/ide/ide-*.c

2009-03-05 16:10:56 +01:00

ide-floppy.c

ide-floppy: do not map dataless cmds to an sg

2009-03-13 21:16:12 +01:00

ide-floppy.h

[PATCH] switch ide_disk_ops ->ioctl() to sane prototype

2008-10-21 07:47:30 -04:00

ide-gd.c

ide: fix refcounting in device drivers

2009-02-25 20:28:24 +01:00

ide-gd.h

ide: fix refcounting in device drivers

2009-02-25 20:28:24 +01:00

ide-generic.c

ide-generic: remove no longer needed ide_probe_legacy()

2008-10-13 21:39:42 +02:00

ide-h8300.c

ide: move read_sff_dma_status() method to 'struct ide_dma_ops'

2009-01-06 17:21:02 +01:00

ide-io-std.c

ide: move standard I/O code to ide-io-std.c

2009-03-24 23:22:46 +01:00

ide-io.c

ide: move error handling code to ide-eh.c (v2)

2009-03-24 23:22:47 +01:00

ide-ioctls.c

ide: remove the last ide-scsi remnants

2009-01-02 16:12:54 +01:00

ide-iops.c

ide: use try_to_identify() in ide_driveid_update()

2009-03-24 23:22:59 +01:00

ide-legacy.c

ide: move legacy ISA/VLB ports handling to ide-legacy.c (v2)

2008-12-29 20:27:37 +01:00

ide-lib.c

ide: move xfer mode tuning code to ide-xfer-mode.c

2009-03-24 23:22:46 +01:00

ide-park.c

ide: move ide_do_park_unpark() to ide-park.c

2009-03-24 23:22:44 +01:00

ide-pci-generic.c

ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS

2009-03-24 23:22:52 +01:00

ide-pio-blacklist.c

ide: move PIO blacklist to ide-pio-blacklist.c

2008-07-16 20:33:39 +02:00

ide-pm.c

ide: fix suspend regression

2009-01-14 19:19:04 +01:00

ide-pnp.c

ide: add ide_host_add() helper

2008-07-23 19:55:57 +02:00

ide-probe.c

ide: use try_to_identify() in ide_driveid_update()

2009-03-24 23:22:59 +01:00

ide-proc.c

ide: remove superfluous check from ide_proc_port_register_devices()

2009-03-24 23:22:40 +01:00

ide-scan-pci.c

ide: replace remaining __FUNCTION__ occurrences

2008-04-26 22:25:20 +02:00

ide-sysfs.c

ide: move sysfs support to ide-sysfs.c

2009-01-02 16:12:48 +01:00

ide-tape.c

ide: NULL noise: drivers/ide/ide-*.c

2009-03-05 16:10:56 +01:00

ide-taskfile.c

ide: remove ide_driver_t typedef

2009-01-06 17:20:53 +01:00

ide-timings.c

ide: include <linux/hdreg.h> only when needed

2008-10-10 22:39:27 +02:00

ide-xfer-mode.c

ide: move xfer mode tuning code to ide-xfer-mode.c

2009-03-24 23:22:46 +01:00

ide.c

ide: move device settings code to ide-devsets.c

2009-03-24 23:22:44 +01:00

it821x.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

it8172.c

Resurrect IT8172 IDE controller driver

2009-01-06 17:21:01 +01:00

it8213.c

ide: remove HWIF() macro

2009-01-06 17:20:52 +01:00

jmicron.c

ide: Switch to a common address

2008-11-02 21:40:08 +01:00

Kconfig

ide: move xfer mode tuning code to ide-xfer-mode.c

2009-03-24 23:22:46 +01:00

macide.c

m68k: machw.h cleanup

2008-12-28 20:00:03 +01:00

Makefile

ide: move error handling code to ide-eh.c (v2)

2009-03-24 23:22:47 +01:00

ns87415.c

ns87415: small ->init_hwif cleanup

2009-03-24 23:22:49 +01:00

opti621.c

ide: remove useless subdirs from drivers/ide/

2008-10-21 20:57:23 +02:00

palm_bk3710.c

drivers/ide/palm_bk3710.c buildfix

2009-01-19 13:46:57 +01:00

pdc202xx_new.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

pdc202xx_old.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

piix.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

pmac.c

ide: move read_sff_dma_status() method to 'struct ide_dma_ops'

2009-01-06 17:21:02 +01:00

q40ide.c

ide: move read_sff_dma_status() method to 'struct ide_dma_ops'

2009-01-06 17:21:02 +01:00

qd65xx.c

Fix my email address in qd65xx.[ch]/pata_qdi.c

2009-02-03 16:53:56 -08:00

qd65xx.h

Fix my email address in qd65xx.[ch]/pata_qdi.c

2009-02-03 16:53:56 -08:00

rapide.c

arm ide breakage

2008-10-26 09:35:05 -07:00

rz1000.c

rz1000: apply chipset quirks early (v2)

2008-12-29 20:27:33 +01:00

sc1200.c

ide: move read_sff_dma_status() method to 'struct ide_dma_ops'

2009-01-06 17:21:02 +01:00

scc_pata.c

scc_pata: make use of scc_dma_sff_read_status()

2009-01-06 17:21:02 +01:00

serverworks.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

setup-pci.c

ide: remove pciirq argument from ide_pci_setup_ports()

2009-03-24 23:22:53 +01:00

sgiioc4.c

ide: move read_sff_dma_status() method to 'struct ide_dma_ops'

2009-01-06 17:21:02 +01:00

siimage.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

sis5513.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

sl82c105.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00

slc90e66.c

ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS

2009-03-24 23:22:52 +01:00

tc86c001.c

ide: move read_sff_dma_status() method to 'struct ide_dma_ops'

2009-01-06 17:21:02 +01:00

triflex.c

ide: remove HWIF() macro

2009-01-06 17:20:52 +01:00

trm290.c

trm290: small ->init_hwif cleanup

2009-03-24 23:22:49 +01:00

tx4938ide.c

tx4938ide: Fix build error due to read_sff_dma_status moving

2009-01-14 19:19:04 +01:00

tx4939ide.c

tx4939ide: typo fix and minor cleanup

2009-02-02 20:12:23 +01:00

umc8672.c

ide: merge ide_hwgroup_t with ide_hwif_t (v2)

2009-01-06 17:20:50 +01:00

via82cxxx.c

ide: fix ->init_chipset method to return 'int' value

2009-03-24 23:22:53 +01:00