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
..
Kconfig	ide: move xfer mode tuning code to ide-xfer-mode.c	2009-03-24 23:22:46 +01:00
Makefile	ide: move error handling code to ide-eh.c (v2)	2009-03-24 23:22:47 +01:00
aec62xx.c	ide: fix ->init_chipset method to return 'int' value	2009-03-24 23:22:53 +01:00
ali14xx.c	…
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	…
cmd64x.c	ide: fix ->init_chipset method to return 'int' value	2009-03-24 23:22:53 +01:00
cmd640.c	…
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	…
cs5536.c	…
cy82c693.c	…
delkin_cb.c	ide: fix ->init_chipset method to return 'int' value	2009-03-24 23:22:53 +01:00
dtc2278.c	…
falconide.c	…
gayle.c	…
hpt366.c	ide: fix ->init_chipset method to return 'int' value	2009-03-24 23:22:53 +01:00
ht6560b.c	…
icside.c	…
ide-4drives.c	…
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.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-cd_ioctl.c	…
ide-cd_verbose.c	…
ide-cs.c	…
ide-devsets.c	ide: move device settings code to ide-devsets.c	2009-03-24 23:22:44 +01:00
ide-disk.c	…
ide-disk.h	…
ide-disk_ioctl.c	…
ide-disk_proc.c	ide: NULL noise: drivers/ide/ide-*.c	2009-03-05 16:10:56 +01:00
ide-dma-sff.c	…
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.c	ide-floppy: do not map dataless cmds to an sg	2009-03-13 21:16:12 +01:00
ide-floppy.h	…
ide-floppy_ioctl.c	…
ide-floppy_proc.c	ide: NULL noise: drivers/ide/ide-*.c	2009-03-05 16:10:56 +01: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-h8300.c	…
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-iops.c	ide: use try_to_identify() in ide_driveid_update()	2009-03-24 23:22:59 +01:00
ide-legacy.c	…
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-pm.c	…
ide-pnp.c	…
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-sysfs.c	…
ide-tape.c	ide: NULL noise: drivers/ide/ide-*.c	2009-03-05 16:10:56 +01:00
ide-taskfile.c	…
ide-timings.c	…
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
ide_arm.c	…
ide_platform.c	…
it821x.c	ide: fix ->init_chipset method to return 'int' value	2009-03-24 23:22:53 +01:00
it8172.c	…
it8213.c	…
jmicron.c	…
macide.c	…
ns87415.c	ns87415: small ->init_hwif cleanup	2009-03-24 23:22:49 +01:00
opti621.c	…
palm_bk3710.c	…
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	…
q40ide.c	…
qd65xx.c	…
qd65xx.h	…
rapide.c	…
rz1000.c	…
sc1200.c	…
scc_pata.c	…
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	…
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	…
triflex.c	…
trm290.c	trm290: small ->init_hwif cleanup	2009-03-24 23:22:49 +01:00
tx4938ide.c	…
tx4939ide.c	…
umc8672.c	…
via82cxxx.c	ide: fix ->init_chipset method to return 'int' value	2009-03-24 23:22:53 +01:00