Linus Torvalds 11bd04f6f3 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ...

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (109 commits)
  PCI: fix coding style issue in pci_save_state()
  PCI: add pci_request_acs
  PCI: fix BUG_ON triggered by logical PCIe root port removal
  PCI: remove ifdefed pci_cleanup_aer_correct_error_status
  PCI: unconditionally clear AER uncorr status register during cleanup
  x86/PCI: claim SR-IOV BARs in pcibios_allocate_resource
  PCI: portdrv: remove redundant definitions
  PCI: portdrv: remove unnecessary struct pcie_port_data
  PCI: portdrv: minor cleanup for pcie_port_device_register
  PCI: portdrv: add missing irq cleanup
  PCI: portdrv: enable device before irq initialization
  PCI: portdrv: cleanup service irqs initialization
  PCI: portdrv: check capabilities first
  PCI: portdrv: move PME capability check
  PCI: portdrv: remove redundant pcie type calculation
  PCI: portdrv: cleanup pcie_device registration
  PCI: portdrv: remove redundant pcie_port_device_probe
  PCI: Always set prefetchable base/limit upper32 registers
  PCI: read-modify-write the pcie device control register when initiating pcie flr
  PCI: show dma_mask bits in /sys
  ...

Fixed up conflicts in:
	arch/x86/kernel/amd_iommu_init.c
	drivers/pci/dmar.c
	drivers/pci/hotplug/acpiphp_glue.c

2009-12-11 12:18:16 -08:00

..

aoe

aoe: prevent cache aliases

2009-12-01 16:32:20 -08:00

drbd

drbd_req.c: use part_[inc|dec]_in_flight()

2009-12-03 17:40:51 +01:00

paride

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

amiflop.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

ataflop.c

ataflop: remove buggy/commented-out IRQ disable from do_fd_request()

2009-11-09 09:40:57 +01:00

brd.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

cciss_cmd.h

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-12-09 19:43:33 -08:00

cciss_scsi.c

cciss: Fix weird usage of ENXIO in cciss_scsi.c

2009-11-13 08:45:54 +01:00

cciss_scsi.h

cciss: Fix cciss SCSI rescan code to better notice device changes

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

cciss.c

cciss: fix scatter gather cleanup problems

2009-11-23 09:31:48 +01:00

cciss.h

cciss: change Cmd_sg_list.sg_chain_dma type to dma_addr_t

2009-11-23 09:35:06 +01:00

cpqarray.c

cpqarray: switch to seq_file

2009-10-01 21:15:40 +02:00

cpqarray.h

…

cryptoloop.c

drivers: Remove unnecessary inclusions of asm/semaphore.h

2008-04-18 22:16:32 -04:00

DAC960.c

dac960: switch to seq_file

2009-10-01 21:15:40 +02:00

DAC960.h

Fix DAC960 driver on machines which don't support 64-bit DMA

2007-09-11 17:21:19 -07:00

floppy.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

hd.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

ida_cmd.h

…

ida_ioctl.h

…

Kconfig

The DRBD driver

2009-10-01 21:17:49 +02:00

loop.c

loop: fix NULL dereference if mount fails

2009-10-29 07:39:27 -07:00

Makefile

The DRBD driver

2009-10-01 21:17:49 +02:00

mg_disk.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

nbd.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

osdblk.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

pktcdvd.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

ps3disk.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

ps3vram.c

block/ps3: fix slow VRAM IO

2009-11-04 09:09:28 +01:00

smart1,2.h

…

sunvdc.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

swim3.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-09-22 07:51:45 -07:00

swim_asm.S

m68k: mac - Add SWIM floppy support

2009-03-26 21:15:27 +01:00

swim.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

sx8.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

ub.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

umem.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

umem.h

drivers/block/umem: trim trailing whitespace

2007-10-10 09:25:59 +02:00

viodasd.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

virtio_blk.c

virtio_blk: Revert serial number support

2009-10-22 16:39:30 +10:30

xd.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

xd.h

[PATCH] switch xd

2008-10-21 07:48:11 -04:00

xen-blkfront.c

xen: move Xen-testing predicates to common header

2009-11-04 08:47:24 -08:00

xsysace.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

z2ram.c

const: make block_device_operations const

2009-09-22 07:17:25 -07:00