summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-03-13Merge commit 'semaphore/semaphore'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt drivers/base/core.c drivers/firewire/fw-device.c
2008-03-13Merge commit 'mtd/master'Stephen Rothwell
2008-03-13Merge commit 'galak/powerpc-next'Stephen Rothwell
2008-03-13Merge commit 'net/master'Stephen Rothwell
2008-03-13Merge commit 'security-testing/next'Stephen Rothwell
2008-03-13Merge commit 'udf/for_next'Stephen Rothwell
2008-03-13Merge commit 'async_tx/next'Stephen Rothwell
2008-03-13Merge commit '4xx/next'Stephen Rothwell
2008-03-13[POWERPC] really export empty_zero_pageStephen Rothwell
It was being protected by CONFIG_PPC32. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-03-13Merge commit 'ext4/next'Stephen Rothwell
2008-03-13Merge commit 'hrt/mm'Stephen Rothwell
2008-03-13Merge commit 'powerpc/powerpc-next'Stephen Rothwell
Conflicts: arch/powerpc/Kconfig
2008-03-13Merge commit 'selinux/for-akpm'Stephen Rothwell
2008-03-13Merge commit 'ocfs2/linux-next'Stephen Rothwell
2008-03-13Merge commit 'tests/master'Stephen Rothwell
Conflicts: lib/Kconfig.debug
2008-03-13Merge commit 'ia64/test'Stephen Rothwell
2008-03-13Merge commit 'scsi/master'Stephen Rothwell
2008-03-13Merge commit 'scsi-rc-fixes/master'Stephen Rothwell
2008-03-13Merge commit 'dlm/next'Stephen Rothwell
2008-03-13Merge commit 'kvm/master'Stephen Rothwell
2008-03-13Merge commit 'ubi/master'Stephen Rothwell
2008-03-13Merge commit 'hwmon/testing'Stephen Rothwell
2008-03-13Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-03-13Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2008-03-13Merge commit 'acpi/test'Stephen Rothwell
2008-03-13Merge commit 'infiniband/for-next'Stephen Rothwell
2008-03-13Merge commit 'xfs/master'Stephen Rothwell
2008-03-13Merge commit 'nfs/linux-next'Stephen Rothwell
2008-03-13Merge branch 'quilt/ide'Stephen Rothwell
Conflicts: Documentation/ide/ide.txt
2008-03-13Merge commit 'jfs/next'Stephen Rothwell
2008-03-13Merge commit 'sh/master'Stephen Rothwell
2008-03-13Merge commit 's390/features'Stephen Rothwell
2008-03-13Merge commit 'v4l-dvb/stable'Stephen Rothwell
2008-03-13Merge commit 'avr32/avr32-arch'Stephen Rothwell
2008-03-13Merge branch 'quilt/kernel-doc'Stephen Rothwell
2008-03-13Merge branch 'quilt/i2c'Stephen Rothwell
2008-03-13Merge commit 'hid/mm'Stephen Rothwell
2008-03-13Merge branch 'quilt/usb'Stephen Rothwell
2008-03-13Merge branch 'quilt/pci'Stephen Rothwell
2008-03-13Revert "SCSI: convert struct class_device to struct device"Stephen Rothwell
This reverts commit 1baad426e96ebcc0fa431462c3ea1819812c6ee1.
2008-03-13Revert "driver core: remove no longer used "struct class_device""Stephen Rothwell
This reverts commit d83d4b91214428738f95c2b6028b6af92f1f9798.
2008-03-13Merge branch 'quilt/driver-core'Stephen Rothwell
2008-03-13ide: remove obsoleted "idex=" kernel parametersBartlomiej Zolnierkiewicz
* Remove obsoleted "idex=" kernel parameters. * Make probe_* and cmd640_vlb variables static. Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-13ide: remove obsoleted "idex=reset" kernel parameterBartlomiej Zolnierkiewicz
Remove obsoleted "idex=reset" kernel parameter (it has been obsoleted since 1 Nov 2004). Then remove corresponding code from ide_probe_port() and no longer used ->reset field from ide_hwif_t. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-13ide: remove obsoleted "idex=serialize" kernel parameterBartlomiej Zolnierkiewicz
Remove obsoleted "idex=serialize" kernel parameter (it has been obsoleted since 1 Nov 2004). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-13ide: add "ignore_cable" kernel parameterBartlomiej Zolnierkiewicz
Add "ignore_cable" kernel parameter: * "ide_core.ignore_cable=[interface_number]" boot option if IDE is built-in (i.e. "ide_core.ignore_cable=1" to force ignoring cable for "ide1") * "ignore_cable=[interface_number]" module parameter (for ide_core module) if IDE is compiled as module Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-13ide: mark special "ide0=" kernel parameters as obsoletedBartlomiej Zolnierkiewicz
Mark "ide0=ali14xx|cmd640_vlb|dtc2278|ht6560b|qd65xx|umc8672" kernel parameters as obsoleted (per host driver replacements have been available for a long time). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-13ide: remove commented out entries from ide_pio_blacklist[]Bartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-13ide-tape: remove pipeline-specific code from idetape_add_chrdev_read_request()Borislav Petkov
In order to do away with queueing read requests on the pipeline, several things have to be done: 1. Do not allocate additional pipeline stages in idetape_init_read() until (tape->nr_stages < max_stages) and do only read operation preparations. As a collateral result, idetape_add_stage_tail() becomes unused so remove it. 2. Queue the read request's buffer directly thru idetape_queue_rw_tail(). 3. Remove now unused idetape_kmalloc_stage() and idetape_switch_buffers(). [bart: simplify the original patch] Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-13ide-tape remove pipeline speed/control calculationsBorislav Petkov
Pipeline handling calculations in idetape_calculate_speeds() can go since they do not have any effect on other functionality besides: 1. info is only being exported through /proc as a read-only item (controlled_pipeline_head_speed, uncontrolled_pipeline_head_speed) 2. used in idetape_restart_speed_control() which, in turn, is unrelated to other code 3. used only for pipeline frames number accounting (tape->pipeline_head), also unused elsewhere. 4.some variables are: only written to: tape->buffer_head; unused: tape->tape_head, tape->last_tape_head Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>