summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2009-05-14Merge commit 'dwmw2-iommu/master'Stephen Rothwell
Conflicts: drivers/pci/intel-iommu.c drivers/pci/intr_remapping.c
2009-05-14Merge commit 'watchdog/master'Stephen Rothwell
2009-05-14Merge commit 'oprofile/auto-oprofile-next'Stephen Rothwell
2009-05-14Merge branch 'quilt/ttydev'Stephen Rothwell
2009-05-14Merge commit 'security-testing/next'Stephen Rothwell
2009-05-14Merge commit 'voltage/for-next'Stephen Rothwell
2009-05-14Merge commit 'mfd/for-next'Stephen Rothwell
2009-05-14Merge commit 'firmware/master'Stephen Rothwell
2009-05-14scsi/block: fixup scsi_transport_fc for block changesStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-05-14Merge commit 'block/for-next'Stephen Rothwell
Conflicts: drivers/block/hd.c drivers/block/mg_disk.c drivers/ide/ide-atapi.c drivers/ide/ide-cd.c drivers/ide/ide-floppy.c drivers/ide/ide-tape.c
2009-05-14Merge commit 'input/next'Stephen Rothwell
2009-05-14Merge commit 'mmc/next'Stephen Rothwell
2009-05-14Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
2009-05-14Merge commit 'crypto/master'Stephen Rothwell
2009-05-14Revert "rfkill: remove user_claim stuff"Stephen Rothwell
This reverts commit 621cac85297de5ba655e3430b007dd2e0da91da6.
2009-05-14Merge commit 'wireless/master'Stephen Rothwell
2009-05-14Merge commit 'net/master'Stephen Rothwell
Conflicts: include/linux/mmc/sdio_ids.h
2009-05-14Merge commit 'scsi/master'Stephen Rothwell
Conflicts: include/Kbuild
2009-05-14Merge commit 'acpi/test'Stephen Rothwell
2009-05-14Merge commit 'infiniband/for-next'Stephen Rothwell
2009-05-14Merge commit 'libata/NEXT'Stephen Rothwell
2009-05-14Merge commit 'ide/for-next'Stephen Rothwell
2009-05-14Merge commit 'v4l-dvb/master'Stephen Rothwell
2009-05-14Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2009-05-14Merge branch 'quilt/i2c'Stephen Rothwell
2009-05-14Merge commit 'hid/for-next'Stephen Rothwell
2009-05-14Merge branch 'quilt/device-mapper'Stephen Rothwell
2009-05-14Merge commit 'pci/linux-next'Stephen Rothwell
2009-05-14Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
2009-05-14Merge commit 'tracing/auto-tracing-next'Stephen Rothwell
2009-05-14Merge commit 'x86/auto-x86-next'Stephen Rothwell
2009-05-14Merge commit 'sh/master'Stephen Rothwell
2009-05-14Merge commit 's390/features'Stephen Rothwell
2009-05-14Merge commit 'pxa/for-next'Stephen Rothwell
2009-05-14Merge commit 'galak/next'Stephen Rothwell
2009-05-14Merge commit 'mips/mips-for-linux-next'Stephen Rothwell
2009-05-14Merge commit 'm68k/for-next'Stephen Rothwell
2009-05-14Merge commit 'avr32/avr32-arch'Stephen Rothwell
2009-05-14Merge commit 'arm/devel'Stephen Rothwell
Conflicts: arch/arm/Kconfig
2009-05-14Merge commit 'crypto-current/master'Stephen Rothwell
2009-05-14Merge branch 'quilt/usb.current'Stephen Rothwell
2009-05-14Merge commit 'wireless-current/master'Stephen Rothwell
2009-05-14Merge commit 'pci-current/for-linus'Stephen Rothwell
2009-05-14net: remove needless (now buggy) & from dev->dev_addrJiri Pirko
Patch fixes issues with dev->dev_addr changing from array to pointer. Hopefully there are no others. Compile tested only. Signed-off-by: Jiri Pirko <jpirko@redhat.com>
2009-05-14net/ibmveth: fix panic in probeStephen Rothwell
netdev->dev_addr changed fomr being an array to being a pointer, so we should not take its address for memcpy(). Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-05-13[SCSI] FC Pass Thru supportJames Smart
Attached is the ELS/CT pass-thru patch for the FC Transport. The patch creates a generic framework that lays on top of bsg and the SGIO v4 ioctl in order to pass transaction requests to LLDD's. The interface supports the following operations: On an fc_host basis: Request login to the specified N_Port_ID, creating an fc_rport. Request logout of the specified N_Port_ID, deleting an fc_rport Send ELS request to specified N_Port_ID w/o requiring a login, and wait for ELS response. Send CT request to specified N_Port_ID and wait for CT response. Login is required, but LLDD is allowed to manage login and decide whether it stays in place after the request is satisfied. Vendor-Unique request. Allows a LLDD-specific request to be passed to the LLDD, and the passing of a response back to the application. On an fc_rport basis: Send ELS request to nport and wait for ELS response. Send CT request to nport and wait for CT response. The patch also exports several headers from include/scsi such that they can be available to user-space applications: include/scsi/scsi.h include/scsi/scsi_netlink.h include/scsi/scsi_netlink_fc.h include/scsi/scsi_bsg_fc.h For further information, refer to the last RFC: http://marc.info/?l=linux-scsi&m=123436574018579&w=2 Note: Documentation is still spotty and will be added later. Signed-off-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
2009-05-13[SCSI] qla2xxx: Update version number to 8.03.01-k2.Andrew Vasquez
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
2009-05-13[SCSI] qla2xxx: Use port number to compute nvram/vpd parameter offsets.Anirban Chakraborty
Read adapter's physical port number from interrupt pin register and use it instead of pci function number to offset into the nvram to obtain the port's configuration parameters. Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com> Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
2009-05-13[SCSI] qla2xxx: Add an override option to specify ISP firmware load semantics.Andrew Vasquez
As it may be useful during debugging to use a specific firmware image. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
2009-05-13[SCSI] qla2xxx: Don't try to 'stop' firmware if already in ROM code.Andrew Vasquez
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>