Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ...

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: ioctl-internal definitions
  pcmcia: cistpl header cleanup
  pcmcia: remove unused argument to pcmcia_parse_tuple()
  pcmcia: card services header cleanup
  pcmcia: device_id header cleanup
  pcmcia: encapsulate ioaddr_t
  pcmcia: cleanup device driver header file
  pcmcia: cleanup socket services header file
  pcmcia: merge ds_internal.h into cs_internal.h
  pcmcia: cleanup cs_internal.h
  pcmcia: cs_internal.h is internal
  pcmcia: use dev_printk for cs_error()
  pcmcia: remove CS_ error codes alltogether
  pcmcia: deprecate CS_BAD_TUPLE
  pcmcia: deprecate CS_BAD_ARGS
  pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
  pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
  pcmcia: deprecate CS_NO_MORE_ITEMS
  pcmcia: deprecate CS_IN_USE
  pcmcia: deprecate CS_CONFIGURATION_LOCKED
  ...

Fix trivial conflict in drivers/pcmcia/ds.c manually

2008-10-13 14:12:40 -07:00

..

aacraid

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

aic7xxx

scsi: fix integer as NULL pointer warnings

2008-04-28 17:31:13 -07:00

aic7xxx_old

…

aic94xx

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

arcmsr

SCSI: convert struct class_device to struct device

2008-04-19 19:10:33 -07:00

arm

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

device_handler

[SCSI] scsi_dh: suppress comparison warning

2008-10-03 12:11:51 -05:00

dpt

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

ibmvscsi

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

libsas

Merge branch 'for-2.6.28' of git://git.kernel.dk/linux-2.6-block

2008-10-10 10:52:45 -07:00

lpfc

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

megaraid

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

pcmcia

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2008-10-13 14:12:40 -07:00

qla2xxx

[SCSI] qla2xxx: fix printk format warnings

2008-10-03 11:46:19 -05:00

qla4xxx

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

sym53c8xx_2

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

.gitignore

[SCSI] 53c7xx: fix removal fallout

2008-01-11 18:22:30 -06:00

3w-9xxx.c

[SCSI] 3w-9xxx: add MSI support and misc fixes

2008-07-26 15:15:00 -04:00

3w-9xxx.h

[SCSI] 3w-9xxx: add MSI support and misc fixes

2008-07-26 15:15:00 -04:00

3w-xxxx.c

Add a bunch of cycle_kernel_lock() calls

2008-06-20 14:05:53 -06:00

3w-xxxx.h

…

53c700_d.h_shipped

…

53c700.c

[SCSI] Let scsi_cmnd->cmnd use request->cmd buffer

2008-05-02 10:18:22 -05:00

53c700.h

[SCSI] 53c700: m68k support for the 53c700 SCSI core

2007-06-17 16:15:56 -05:00

53c700.scr

…

a100u2w.c

Don't crash on IOMMU overflow in A100U2W driver

2008-07-15 14:30:56 -07:00

a100u2w.h

[SCSI] a100u2w: Convert into Linux style

2007-06-17 16:09:29 -05:00

a2091.c

[SCSI] wd33c93: fix up cut and paste error

2008-04-07 12:19:07 -05:00

a2091.h

…

a3000.c

[SCSI] WD33C93: let platform stub override no_sync/fast/dma_mode

2008-04-07 12:19:01 -05:00

a3000.h

…

a4000t.c

[SCSI] kmalloc + memset conversion to kzalloc

2007-10-12 14:41:00 -04:00

advansys.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

aha152x.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

aha152x.h

[SCSI] aha152x: fix debug mode symbol conflict

2007-08-04 09:11:06 -05:00

aha1542.c

[SCSI] aha1542: minor irq handler cleanups

2008-04-27 12:19:55 -05:00

aha1542.h

…

aha1740.c

[SCSI] remove use_sg_chaining

2008-01-30 13:14:02 -06:00

aha1740.h

…

aic7xxx_old.c

Remove pointless casts from void pointers

2008-02-06 10:41:01 -08:00

atari_dma_emul.c

…

atari_NCR5380.c

[SCSI] atari_NCR5380, sun3_NCR5380: operator precedence fix

2008-01-11 18:28:57 -06:00

atari_scsi.c

[SCSI] NCR5380: Fix bugs and canonicalize irq handler usage

2007-11-25 12:19:26 +02:00

atari_scsi.h

m68k: Atari SCSI driver compile fixes

2007-05-04 17:59:05 -07:00

atp870u.c

scsi: fix integer as NULL pointer warning

2008-05-23 08:11:07 -07:00

atp870u.h

…

BusLogic.c

[SCSI] BusLogic: make FlashPoint support x86-32 only

2008-04-07 12:15:44 -05:00

BusLogic.h

[SCSI] BusLogic: make FlashPoint support x86-32 only

2008-04-07 12:15:44 -05:00

bvme6000_scsi.c

[SCSI] kmalloc + memset conversion to kzalloc

2007-10-12 14:41:00 -04:00

ch.c

[SCSI] ch: fix ch_remove oops

2008-07-26 15:17:47 -04:00

constants.c

[SCSI] add support for variable length extended commands

2008-05-02 11:33:25 -05:00

dc395x.c

[SCSI] Remove random noop unchecked_isa_dma users

2008-04-07 12:15:40 -05:00

dc395x.h

…

dmx3191d.c

…

dpt_i2o.c

device create: scsi: convert device_create to device_create_drvdata

2008-07-21 21:54:44 -07:00

dpti.h

drivers/scsi/dpt_i2o.c: fix build on alpha

2008-05-08 10:46:56 -07:00

dtc.c

[SCSI] NCR5380: Fix bugs and canonicalize irq handler usage

2007-11-25 12:19:26 +02:00

dtc.h

…

eata_generic.h

[SCSI] eata_pio: Remove FALSE/TRUE defines

2007-03-20 11:27:03 -05:00

eata_pio.c

[SCSI] Remove random noop unchecked_isa_dma users

2008-04-07 12:15:40 -05:00

eata_pio.h

…

eata.c

[SCSI] aha152x, eata, u14-34f: minor irq handler cleanups

2008-04-25 09:52:30 -05:00

esp_scsi.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2008-07-15 18:58:04 -07:00

esp_scsi.h

sparc: Kill SBUS DVMA layer.

2008-08-29 02:13:10 -07:00

fd_mcs.c

[SCSI] fd_mcs: convert to accessors and !use_sg cleanup

2008-01-11 18:22:35 -06:00

fdomain.c

scsi: fix integer as NULL pointer warnings

2008-04-28 17:31:13 -07:00

fdomain.h

…

FlashPoint.c

[SCSI] FlashPoint: fix off-by-one errors

2008-04-27 12:19:55 -05:00

g_NCR5380_mmio.c

…

g_NCR5380.c

[SCSI] NCR5380: Fix bugs and canonicalize irq handler usage

2007-11-25 12:19:26 +02:00

g_NCR5380.h

…

gdth_ioctl.h

…

gdth_proc.c

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

gdth_proc.h

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

gdth.c

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

gdth.h

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

gvp11.c

[SCSI] wd33c93: fix up cut and paste error

2008-04-07 12:19:07 -05:00

gvp11.h

…

hosts.c

[SCSI] scsi_host_lookup: error returns and NULL pointers

2008-10-03 11:46:12 -05:00

hptiop.c

remove unnecessary <linux/hdreg.h> includes

2008-08-05 18:16:58 +02:00

hptiop.h

[SCSI] hptiop: add more adapter models and other fixes

2008-01-11 18:28:06 -06:00

ibmmca.c

[SCSI] remove use_sg_chaining

2008-01-30 13:14:02 -06:00

ide-scsi.c

ide: Remove ide_spin_wait_hwgroup() and use special requests instead

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

imm.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

imm.h

…

in2000.c

[SCSI] in2000: convert to accessors and !use_sg cleanup

2008-01-11 18:22:36 -06:00

in2000.h

…

initio.c

[SCSI] Let scsi_cmnd->cmnd use request->cmd buffer

2008-05-02 10:18:22 -05:00

initio.h

[SCSI] initio: Convert into a real Linux driver and update to modern style

2007-05-22 11:08:56 -05:00

ipr.c

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

ipr.h

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

ips.c

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

ips.h

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

iscsi_tcp.c

[SCSI] libiscsi, iscsi_tcp, ib_iser: fix setting of can_queue with old tools.

2008-07-12 08:22:29 -05:00

iscsi_tcp.h

[SCSI] iscsi_tcp: handle iscsi_cmd_task rename

2008-07-12 08:22:20 -05:00

jazz_esp.c

[SCSI] jazz_esp, sgiwd93, sni_53c710, sun3x_esp: fix platform driver hotplug/coldplug

2008-04-27 12:33:04 -05:00

Kconfig

[SCSI] qla2xxx: remove the unused SCSI_QLOGIC_FC_FIRMWARE option

2008-10-03 12:11:51 -05:00

lasi700.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

libiscsi.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2008-10-10 10:53:26 -07:00

libsrp.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

mac53c94.c

[SCSI] remove use_sg_chaining

2008-01-30 13:14:02 -06:00

mac53c94.h

…

mac_esp.c

MODULE_LICENSE expects "GPL v2", not "GPLv2"

2008-05-21 16:56:00 -07:00

mac_scsi.c

[SCSI] Remove random noop unchecked_isa_dma users

2008-04-07 12:15:40 -05:00

mac_scsi.h

…

Makefile

[SCSI] sd: Support for SCSI disk (SBC) Data Integrity Field

2008-07-26 15:14:56 -04:00

megaraid.c

Add a bunch of cycle_kernel_lock() calls

2008-06-20 14:05:53 -06:00

megaraid.h

[SCSI] megaraid: fix warnings when CONFIG_PROC_FS=n

2007-05-08 11:15:08 -05:00

mesh.c

[SCSI] SCSI: remove dev->power.power_state from mesh driver

2008-06-05 09:23:44 -05:00

mesh.h

…

mvme16x_scsi.c

[SCSI] kmalloc + memset conversion to kzalloc

2007-10-12 14:41:00 -04:00

mvme147.c

[SCSI] wd33c93: fix up cut and paste error

2008-04-07 12:19:07 -05:00

mvme147.h

…

mvsas.c

drivers/scsi/mvsas.c: fix printk warnings

2008-05-01 08:04:03 -07:00

ncr53c8xx.c

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

ncr53c8xx.h

[SCSI] ncr53c8xx: Call scsi_host_put in release

2007-10-12 14:51:18 -04:00

NCR53c406a.c

[SCSI] remove use_sg_chaining

2008-01-30 13:14:02 -06:00

NCR5380.c

[SCSI] NCR5380: fix section mismatch

2008-01-23 13:44:31 -06:00

NCR5380.h

[SCSI] NCR5380: Use scsi_eh API for REQUEST_SENSE invocation

2007-10-12 14:55:07 -04:00

NCR_D700.c

[SCSI] kmalloc + memset conversion to kzalloc

2007-10-12 14:41:00 -04:00

NCR_D700.h

…

NCR_Q720.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

NCR_Q720.h

…

nsp32_debug.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

nsp32_io.h

…

nsp32.c

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

nsp32.h

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

osst_detect.h

…

osst_options.h

…

osst.c

Merge commit 'v2.6.26' into bkl-removal

2008-07-14 15:29:34 -06:00

osst.h

[SCSI] osst: Use mutex instead of semaphore

2007-10-12 14:50:55 -04:00

pas16.c

[SCSI] NCR5380: Fix bugs and canonicalize irq handler usage

2007-11-25 12:19:26 +02:00

pas16.h

…

ppa.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

ppa.h

…

ps3rom.c

[SCSI] ps3rom: use scsi_build_sense_buffer

2008-04-07 12:19:02 -05:00

ql1040_fw.h

…

ql1280_fw.h

…

ql12160_fw.h

…

qla1280.c

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

qla1280.h

[SCSI] qla1280: eliminate wasted space in request and response ring

2007-10-23 12:35:35 -04:00

qlogicfas408.c

[SG] Update drivers to use sg helpers

2007-10-22 21:19:53 +02:00

qlogicfas408.h

…

qlogicfas.c

[SCSI] remove use_sg_chaining

2008-01-30 13:14:02 -06:00

qlogicpti_asm.c

…

qlogicpti.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-11 12:39:35 -07:00

qlogicpti.h

qlogicpti: Convert to pure OF driver.

2008-08-29 02:14:46 -07:00

raid_class.c

SCSI: convert struct class_device to struct device

2008-04-19 19:10:33 -07:00

script_asm.pl

…

scsi_debug.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

scsi_devinfo.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

scsi_error.c

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

scsi_ioctl.c

[SCSI] sd,sr: add early detection of medium not present

2008-01-11 18:22:50 -06:00

scsi_lib_dma.c

[SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA

2007-07-14 19:28:10 -05:00

scsi_lib.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2008-10-10 10:53:26 -07:00

scsi_logging.h

…

scsi_module.c

…

scsi_netlink.c

[SCSI] scsi_netlink: Add transport and LLD recieve and event support

2008-10-03 11:46:13 -05:00

scsi_priv.h

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

scsi_proc.c

[SCSI] scsi_host_lookup: error returns and NULL pointers

2008-10-03 11:46:12 -05:00

scsi_sas_internal.h

SCSI: convert struct class_device to struct device

2008-04-19 19:10:33 -07:00

scsi_scan.c

[SCSI] Update the SCSI state model to allow blocking in the created state

2008-10-03 11:46:13 -05:00

scsi_sysctl.c

[SCSI] small cleanups

2007-07-18 11:16:32 -05:00

scsi_sysfs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2008-10-10 10:53:26 -07:00

scsi_tgt_if.c

scsi-tgt: BKL pushdown

2008-07-02 15:06:25 -06:00

scsi_tgt_lib.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2008-10-10 10:53:26 -07:00

scsi_tgt_priv.h

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

scsi_transport_api.h

…

scsi_transport_fc_internal.h

[SCSI] fc_transport: add target driver support

2007-10-12 14:46:58 -04:00

scsi_transport_fc.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2008-10-10 10:53:26 -07:00

scsi_transport_iscsi.c

[SCSI] scsi_host_lookup: error returns and NULL pointers

2008-10-03 11:46:12 -05:00

scsi_transport_sas.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

scsi_transport_spi.c

[SCSI] scsi_transport_spi: fix oops in revalidate

2008-07-30 10:22:39 -05:00

scsi_transport_srp_internal.h

[SCSI] scsi_transport_srp: remove tgt dependencies

2007-10-12 14:38:09 -04:00

scsi_transport_srp.c

SCSI: convert struct class_device to struct device

2008-04-19 19:10:33 -07:00

scsi_typedefs.h

…

scsi_wait_scan.c

…

scsi.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2008-10-10 10:53:26 -07:00

scsi.h

…

scsicam.c

[SCSI] Add Documentation and integrate into docbook build

2008-01-11 18:22:40 -06:00

sd_dif.c

[SCSI] sd: Support for SCSI disk (SBC) Data Integrity Field

2008-07-26 15:14:56 -04:00

sd.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2008-10-10 10:53:26 -07:00

sd.h

Re-introduce "[SCSI] extend the last_sector_bug flag to cover more sectors"

2008-08-05 21:42:21 -07:00

ses.c

[SCSI] ses: fix VPD inquiry overrun

2008-07-30 10:21:56 -05:00

sg.c

sg: remove unnecessary blk_rq_unmap_user

2008-10-09 08:56:16 +02:00

sgiwd93.c

[SCSI] jazz_esp, sgiwd93, sni_53c710, sun3x_esp: fix platform driver hotplug/coldplug

2008-04-27 12:33:04 -05:00

sim710.c

Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2007-07-22 11:36:49 -07:00

sni_53c710.c

[SCSI] jazz_esp, sgiwd93, sni_53c710, sun3x_esp: fix platform driver hotplug/coldplug

2008-04-27 12:33:04 -05:00

sr_ioctl.c

[SCSI] sr: fix test unit ready responses

2008-02-07 18:02:44 -06:00

sr_vendor.c

…

sr.c

block: unify request timeout handling

2008-10-09 08:56:13 +02:00

sr.h

[SCSI] sr: fix test unit ready responses

2008-02-07 18:02:44 -06:00

st_options.h

[SCSI] st: add option to use SILI in variable block reads

2008-04-07 12:15:39 -05:00

st.c

[SCSI] st: Remove bogus memset

2008-07-26 15:14:47 -04:00

st.h

[SCSI] st: add option to use SILI in variable block reads

2008-04-07 12:15:39 -05:00

stex.c

[SCSI] stex: fix queue depth setting

2008-07-26 15:14:49 -04:00

sun3_NCR5380.c

[SCSI] atari_NCR5380, sun3_NCR5380: operator precedence fix

2008-01-11 18:28:57 -06:00

sun3_scsi_vme.c

[SCSI] sun3_scsi_vme: add MODULE_LICENSE

2008-04-16 09:28:11 -05:00

sun3_scsi.c

[SCSI] NCR5380: Fix bugs and canonicalize irq handler usage

2007-11-25 12:19:26 +02:00

sun3_scsi.h

…

sun3x_esp.c

[SCSI] jazz_esp, sgiwd93, sni_53c710, sun3x_esp: fix platform driver hotplug/coldplug

2008-04-27 12:33:04 -05:00

sun_esp.c

sparc: Annotate of_device_id arrays with const or __initdata.

2008-08-31 01:23:17 -07:00

sym53c416.c

[SCSI] sym53c416: fix module parameters

2008-02-12 15:24:58 -06:00

sym53c416.h

…

t128.c

[SCSI] NCR5380: Fix bugs and canonicalize irq handler usage

2007-11-25 12:19:26 +02:00

t128.h

…

tmscsim.c

[SCSI] tmscsim: Fixup KERN_INFO in printk

2008-10-03 11:46:12 -05:00

tmscsim.h

[SCSI] tmscsim: Further clean-up of the driver

2007-07-14 18:56:33 -05:00

u14-34f.c

[SCSI] u14-34f: Fix 32bit only problem

2008-05-02 13:18:06 -05:00

ultrastor.c

scsi: fix integer as NULL pointer warnings

2008-04-28 17:31:13 -07:00

ultrastor.h

…

wd33c93.c

[SCSI] WD33C93: let platform stub override no_sync/fast/dma_mode

2008-04-07 12:19:01 -05:00

wd33c93.h

Spelling fix: explicitly

2007-10-19 23:22:55 +02:00

wd7000.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

zalon.c

[SCSI] replace __FUNCTION__ with __func__

2008-07-27 10:31:49 -04:00

zorro7xx.c

m68k: zorro7xx needs <asm/amigahw.h>

2007-11-29 09:24:52 -08:00