original_kernel/drivers/ide
Linus Torvalds 6c51038900 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
  Documentation/iostats.txt: bit-size reference etc.
  cfq-iosched: removing unnecessary think time checking
  cfq-iosched: Don't clear queue stats when preempt.
  blk-throttle: Reset group slice when limits are changed
  blk-cgroup: Only give unaccounted_time under debug
  cfq-iosched: Don't set active queue in preempt
  block: fix non-atomic access to genhd inflight structures
  block: attempt to merge with existing requests on plug flush
  block: NULL dereference on error path in __blkdev_get()
  cfq-iosched: Don't update group weights when on service tree
  fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
  block: Require subsystems to explicitly allocate bio_set integrity mempool
  jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  fs: make fsync_buffers_list() plug
  mm: make generic_writepages() use plugging
  blk-cgroup: Add unaccounted time to timeslice_used.
  block: fixup plugging stubs for !CONFIG_BLOCK
  block: remove obsolete comments for blkdev_issue_zeroout.
  blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
  ...

Fix up conflicts in fs/{aio.c,super.c}
2011-03-24 10:16:26 -07:00
..
Kconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
Makefile ide: change to new flag variable 2011-03-17 14:05:34 +01:00
aec62xx.c
ali14xx.c
alim15x3.c
amd74xx.c
at91_ide.c
atiixp.c
au1xxx-ide.c
buddha.c
cmd64x.c
cmd640.c
cs5520.c
cs5530.c
cs5535.c
cs5536.c
cy82c693.c
delkin_cb.c
dtc2278.c
falconide.c
gayle.c
hpt366.c hpt366: fix clock turnaround 2010-10-26 10:17:29 -07:00
ht6560b.c
icside.c
ide-4drives.c
ide-acpi.c
ide-atapi.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
ide-cd.c Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core 2011-03-10 08:58:35 +01:00
ide-cd.h ide: Convert to bdops->check_events() 2011-03-09 19:54:27 +01:00
ide-cd_ioctl.c ide: Convert to bdops->check_events() 2011-03-09 19:54:27 +01:00
ide-cd_verbose.c
ide-cs.c
ide-devsets.c
ide-disk.c
ide-disk.h
ide-disk_ioctl.c
ide-disk_proc.c
ide-dma-sff.c
ide-dma.c ide: clean up timed out request handling 2010-10-26 10:17:30 -07:00
ide-eh.c
ide-floppy.c
ide-floppy.h
ide-floppy_ioctl.c
ide-floppy_proc.c
ide-gd.c ide: Convert to bdops->check_events() 2011-03-09 19:54:27 +01:00
ide-gd.h
ide-generic.c
ide-h8300.c
ide-io-std.c
ide-io.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
ide-ioctls.c
ide-iops.c
ide-legacy.c
ide-lib.c
ide-park.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
ide-pci-generic.c
ide-pio-blacklist.c
ide-pm.c
ide-pnp.c
ide-probe.c
ide-proc.c
ide-scan-pci.c
ide-sysfs.c
ide-tape.c
ide-taskfile.c
ide-timings.c
ide-xfer-mode.c
ide.c
ide_platform.c
it821x.c
it8172.c
it8213.c
jmicron.c
macide.c
ns87415.c
opti621.c
palm_bk3710.c
pdc202xx_new.c
pdc202xx_old.c
piix.c
pmac.c
q40ide.c
qd65xx.c
qd65xx.h
rapide.c
rz1000.c
sc1200.c
scc_pata.c
serverworks.c
setup-pci.c
sgiioc4.c
siimage.c
sis5513.c
sl82c105.c
slc90e66.c
tc86c001.c
triflex.c
trm290.c
tx4938ide.c
tx4939ide.c
umc8672.c
via82cxxx.c