Greg Kroah-Hartman 2bcb132c69 Merge 3.6-rc6 into usb-next ...

This resolves the merge problems with:
	drivers/usb/dwc3/gadget.c
	drivers/usb/musb/tusb6010.c
that had been seen in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-09-16 20:42:46 -07:00

..

aoe

…

drbd

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

2012-08-25 11:36:43 -07:00

mtip32xx

mtip32xx: Create debugfs entries for troubleshooting

2012-06-05 09:13:49 +02:00

paride

paride/pcd: fix bool verbose module parameter.

2012-01-13 09:32:26 +10:30

xen-blkback

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

2012-06-13 21:19:06 +02:00

amiflop.c

…

ataflop.c

…

brd.c

block: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:16 +08:00

cciss_cmd.h

…

cciss_scsi.c

cciss: fix incorrect scsi status reporting

2012-08-21 16:45:02 -07:00

cciss_scsi.h

…

cciss.c

block: add and use scsi_blk_cmd_ioctl

2012-01-14 15:07:24 -08:00

cciss.h

…

cpqarray.c

…

cpqarray.h

…

cryptoloop.c

…

DAC960.c

dac960: Remove unused variables from DAC960_CreateProcEntries()

2012-05-11 16:42:14 +02:00

DAC960.h

…

floppy.c

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy into for-3.6/drivers

2012-07-31 11:47:36 +02:00

hd.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ida_cmd.h

…

ida_ioctl.h

…

Kconfig

block: remove the deprecated ub driver

2012-09-05 17:18:53 -07:00

loop.c

blk: fix wrong idr_pre_get() error check in loop.c

2012-07-14 15:39:58 -07:00

Makefile

block: remove the deprecated ub driver

2012-09-05 17:18:53 -07:00

mg_disk.c

mg_disk: Use struct dev_pm_ops for power management

2012-07-06 19:07:00 +02:00

nbd.c

Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-block

2012-08-01 09:06:47 -07:00

nvme.c

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

2012-03-20 21:12:50 -07:00

osdblk.c

…

pktcdvd.c

block: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:16 +08:00

ps3disk.c

…

ps3vram.c

…

rbd_types.h

rbd: dynamically allocate image name

2012-07-30 09:30:04 -07:00

rbd.c

rbd: create rbd_refresh_helper()

2012-07-30 18:21:46 -07:00

smart1,2.h

…

sunvdc.c

powerpc+sparc/vio: Modernize driver registration

2012-03-28 11:33:24 +11:00

swim3.c

…

swim_asm.S

…

swim.c

…

sx8.c

block, sx8: fix pointer math issue getting fw version

2012-03-03 19:44:39 +01:00

umem.c

blk: pass from_schedule to non-request unplug functions.

2012-07-31 09:08:15 +02:00

umem.h

…

virtio_blk.c

virtio-blk: allow toggling host cache between writeback and writethrough

2012-07-30 13:30:52 +09:30

xd.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

xd.h

…

xen-blkfront.c

Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random

2012-07-31 19:07:42 -07:00

xsysace.c

block: xsysace: Don't use NO_IRQ

2012-01-05 08:34:29 +01:00

z2ram.c

…