Linus Torvalds
23d69b09b7
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
...
* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
usb: don't use flush_scheduled_work()
speedtch: don't abuse struct delayed_work
media/video: don't use flush_scheduled_work()
media/video: explicitly flush request_module work
ioc4: use static work_struct for ioc4_load_modules()
init: don't call flush_scheduled_work() from do_initcalls()
s390: don't use flush_scheduled_work()
rtc: don't use flush_scheduled_work()
mmc: update workqueue usages
mfd: update workqueue usages
dvb: don't use flush_scheduled_work()
leds-wm8350: don't use flush_scheduled_work()
mISDN: don't use flush_scheduled_work()
macintosh/ams: don't use flush_scheduled_work()
vmwgfx: don't use flush_scheduled_work()
tpm: don't use flush_scheduled_work()
sonypi: don't use flush_scheduled_work()
hvsi: don't use flush_scheduled_work()
xen: don't use flush_scheduled_work()
gdrom: don't use flush_scheduled_work()
...
Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
as per Tejun.
2011-01-07 16:58:04 -08:00
..
aoe
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-11-14 11:57:05 -08:00
drbd
drbd: fix for spin_lock_irqsave in endio callback
2010-11-27 19:50:43 +01:00
paride
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
amiflop.c
block: fix amiga and atari floppy driver compile warning
2010-11-15 19:32:43 +01:00
ataflop.c
block: fix amiga and atari floppy driver compile warning
2010-11-15 19:32:43 +01:00
brd.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
cciss.c
Fix build error in drivers/block/cciss.c
2010-12-20 21:21:49 -08:00
cciss.h
cciss: fix board status waiting code
2010-10-23 18:45:06 +02:00
cciss_cmd.h
cciss_scsi.c
SCSI host lock push-down
2010-11-16 13:33:23 -08:00
cciss_scsi.h
cpqarray.c
block: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:10 +02:00
cpqarray.h
cryptoloop.c
DAC960.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
DAC960.h
floppy.c
floppy: don't use flush_scheduled_work()
2010-12-24 15:59:06 +01:00
hd.c
ida_cmd.h
ida_ioctl.h
Kconfig
rbd: introduce rados block device (rbd), based on libceph
2010-10-20 15:38:13 -07:00
loop.c
block: remove REQ_HARDBARRIER
2010-11-10 14:54:09 +01:00
Makefile
rbd: introduce rados block device (rbd), based on libceph
2010-10-20 15:38:13 -07: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
block: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:10 +02:00
osdblk.c
block: remove spurious uses of REQ_HARDBARRIER
2010-09-10 12:35:36 +02:00
pktcdvd.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
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
rbd.c
rbd: replace the rbd sysfs interface
2010-12-01 15:53:22 -08:00
rbd_types.h
rbd: introduce rados block device (rbd), based on libceph
2010-10-20 15:38:13 -07:00
smart1,2.h
sunvdc.c
swim.c
block: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:10 +02:00
swim3.c
block: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:10 +02:00
swim_asm.S
sx8.c
ub.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2010-10-22 20:30:48 -07:00
umem.c
umem.h
viodasd.c
block: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:10 +02:00
virtio_blk.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
xd.c
block: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:10 +02:00
xd.h
xen-blkfront.c
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
xsysace.c
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-10-25 08:19:14 -07:00
z2ram.c
drivers/block/z2ram.c: correct printing of sector_t
2010-10-28 06:15:26 -06:00