Jiri Kosina e060c38434 Merge branch 'master' into for-next ...

Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.

2011-09-15 15:08:18 +02:00

..

aoe

drivers/block/aoe/Makefile: replace the use of <module>-objs with <module>-y

2011-01-19 08:25:02 -07:00

drbd

Merge branch 'master' into for-next

2011-09-15 15:08:18 +02:00

paride

block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal

2011-06-02 05:29:19 +09:00

xen-blkback

Remove unneeded version.h includes from drivers/block/

2011-09-15 14:57:06 +02:00

amiflop.c

block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers

2011-04-21 21:33:05 +02:00

ataflop.c

block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers

2011-04-21 21:33:05 +02:00

brd.c

brd: export module parameters

2011-05-26 21:06:50 +02:00

cciss_cmd.h

cciss: use new doorbell-bit-5 reset method

2011-05-06 08:23:55 -06:00

cciss_scsi.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

cciss_scsi.h

cciss: add cciss_tape_cmds module paramter

2011-05-06 08:23:59 -06:00

cciss.c

cciss: fix compile issue

2011-05-06 08:27:00 -06:00

cciss.h

cciss: do not attempt to read from a write-only register

2011-07-09 09:04:12 +02:00

cpqarray.c

block: remove per-queue plugging

2011-03-10 08:52:07 +01:00

cpqarray.h

…

cryptoloop.c

…

DAC960.c

block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers

2011-04-21 21:33:05 +02:00

DAC960.h

…

floppy.c

Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6

2011-05-29 11:18:09 -07:00

hd.c

i8253: Create linux/i8253.h and use it in all 8253 related files

2011-06-09 15:01:37 +02:00

ida_cmd.h

…

ida_ioctl.h

…

Kconfig

Merge branch 'stable/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus

2011-08-09 20:43:26 +02:00

loop.c

loop: fix deadlock when sysfs and LOOP_CLR_FD race against each other

2011-07-31 22:21:35 +02:00

Makefile

xen/blkback: Move it from drivers/xen to drivers/block

2011-04-18 14:30:26 -04:00

mg_disk.c

block: switch s390 tape_block and mg_disk to elevator_change()

2010-08-23 14:02:44 +02:00

nbd.c

nbd: adjust 'max_part' according to part_shift

2011-05-28 14:44:46 +02:00

osdblk.c

block: remove spurious uses of REQ_HARDBARRIER

2010-09-10 12:35:36 +02:00

pktcdvd.c

kill useless checks for sb->s_op == NULL

2011-07-20 01:44:21 -04:00

ps3disk.c

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

2010-10-22 17:07:18 -07:00

ps3vram.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

rbd_types.h

rbd: introduce rados block device (rbd), based on libceph

2010-10-20 15:38:13 -07:00

rbd.c

Merge branch 'master' into for-next

2011-09-15 15:08:18 +02:00

smart1,2.h

fix typos 'comamnd' -> 'command' in comments

2011-02-02 11:31:21 +01:00

sunvdc.c

block: Consolidate phys_segment and hw_segment limits

2010-02-26 13:58:08 +01:00

swim3.c

block: swim3: fix unterminated of_device_id table

2011-08-03 15:02:55 +02:00

swim_asm.S

m68k: mac - Add SWIM floppy support

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

swim.c

block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers

2011-04-21 21:33:05 +02:00

sx8.c

block: Consolidate phys_segment and hw_segment limits

2010-02-26 13:58:08 +01:00

ub.c

block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers

2011-04-21 21:33:05 +02:00

umem.c

Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core

2011-03-10 08:58:35 +01:00

umem.h

…

viodasd.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

virtio_blk.c

drivers, block: virtio_blk: Replace cryptic number with the macro

2011-05-30 11:14:13 +09:30

xd.c

block: autoconvert trivial BKL users to private mutex

2010-10-05 15:01:10 +02:00

xd.h

…

xen-blkfront.c

xen-blkfront: Fix one off warning about name clash

2011-07-14 14:19:51 -04:00

xsysace.c

dt: remove extra xsysace platform_driver registration

2011-07-14 05:33:52 -06:00

z2ram.c

drivers/block/z2ram.c: correct printing of sector_t

2010-10-28 06:15:26 -06:00