黄涛 a2ad9f9801 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb ...

Conflicts:
	drivers/net/usb/asix.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/usb/serial/option.c

2012-07-12 18:46:41 +08:00

..

blk-cgroup.c

blk-cgroup: be able to remove the record of unplugged device

2011-10-03 11:40:42 -07:00

blk-cgroup.h

cfq-iosched: Make IO merge related stats per cpu

2011-05-23 10:02:19 +02:00

blk-core.c

Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb

2012-07-12 18:08:01 +08:00

blk-exec.c

fix crash in scsi_dispatch_cmd()

2011-08-04 21:58:36 -07:00

blk-flush.c

block: hold queue if flush is running for non-queueable flush drive

2011-05-06 11:36:25 -06:00

blk-integrity.c

dm: improve block integrity support

2011-04-05 23:52:43 +02:00

blk-ioc.c

block: Use hlist_entry() for io_context.cic_list.first

2011-06-02 13:05:02 +02:00

blk-iopoll.c

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

blk-lib.c

blkdev: Do not return -EOPNOTSUPP if discard is supported

2011-05-06 19:30:01 -06:00

blk-map.c

block: Always check length of all iov entries in blk_rq_map_user_iov()

2011-11-21 14:31:26 -08:00

blk-merge.c

block: attempt to merge with existing requests on plug flush

2011-03-21 10:14:27 +01:00

blk-settings.c

block: Fix discard topology stacking and reporting

2011-05-18 10:37:35 +02:00

blk-softirq.c

generic-ipi: remove CSD_FLAG_WAIT

2009-02-25 14:13:44 +01:00

blk-sysfs.c

block: Free queue resources at blk_release_queue()

2011-10-03 11:41:13 -07:00

blk-tag.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

blk-throttle.c

block: Add __attribute__((format(printf...) and fix fallout

2011-06-13 10:42:49 +02:00

blk-timeout.c

block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer

2010-04-21 17:42:08 +02:00

blk.h

Merge branch 'for-linus' into for-2.6.40/core

2011-05-20 20:36:16 +02:00

bsg.c

bsg: fix sysfs link remove warning

2012-03-12 10:32:57 -07:00

cfq-iosched.c

cfq-iosched: fix cfq_cic_link() race confition

2012-01-06 14:13:46 -08:00

cfq.h

blk-cgroup: Add unaccounted time to timeslice_used.

2011-03-12 16:54:00 +01:00

compat_ioctl.c

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

deadline-iosched.c

block: remove per-queue plugging

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

elevator.c

block: get rid of on-stack plugging debug checks

2011-05-20 20:52:16 +02:00

genhd.c

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

2012-07-12 18:46:41 +08:00

ioctl.c

block: fix refcounting in BLKBSZSET

2011-02-24 08:54:21 -08:00

Kconfig

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

Kconfig.iosched

blk-cgroup: config options re-arrangement

2010-04-26 19:27:56 +02:00

Makefile

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

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

noop-iosched.c

block: remove per-queue plugging

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

scsi_ioctl.c

block: fail SCSI passthrough ioctls on partition devices

2012-01-25 17:24:54 -08:00