Benjamin Herrenschmidt 874f2f997d Merge commit 'origin/master' into next ...

Manual merge of:
	drivers/char/hvc_console.c
	drivers/char/hvc_console.h

2010-02-26 14:41:00 +11:00

..

aoe

aoe: switch to the new bio_flush_dcache_pages() interface

2009-12-22 09:12:48 +01:00

drbd

drbd: null dereference bug

2010-01-25 18:01:41 +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: Make cciss_seq_show handle holes in the h->drv[] array

2010-02-05 13:15:36 +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

drivers/block/DAC960.c: use DAC960_V2_Controller

2009-12-22 09:12:48 +01: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

floppy: Add an extra bound check on ioctl arguments

2009-12-15 08:53:25 -08: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

drivers/block/mg_disk.c: use resource_size()

2009-12-22 09:12:48 +01: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

pktcdvd: removing device does not remove its sysfs dir

2010-02-02 18:11:23 -08: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

powerpc/macio: Rework hotplug media bay support

2009-12-09 17:09:14 +11: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

powerpc/viodasd: Remove VIOD_KERN_<level> macros for printks

2010-02-03 17:39:48 +11:00

virtio_blk.c

virtio_blk: add block topology support

2010-02-24 14:22:26 +10:30

xd.c

block,xd: Delay allocation of DMA buffers until device is known

2009-12-09 15:11:03 +01: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