leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0842e1755c
linux/drivers/block
History
Linus Torvalds 6fd03301d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (64 commits)
  debugfs: use specified mode to possibly mark files read/write only
  debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
  xen: remove driver_data direct access of struct device from more drivers
  usb: gadget: at91_udc: remove driver_data direct access of struct device
  uml: remove driver_data direct access of struct device
  block/ps3: remove driver_data direct access of struct device
  s390: remove driver_data direct access of struct device
  parport: remove driver_data direct access of struct device
  parisc: remove driver_data direct access of struct device
  of_serial: remove driver_data direct access of struct device
  mips: remove driver_data direct access of struct device
  ipmi: remove driver_data direct access of struct device
  infiniband: ehca: remove driver_data direct access of struct device
  ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device
  hvcs: remove driver_data direct access of struct device
  xen block: remove driver_data direct access of struct device
  thermal: remove driver_data direct access of struct device
  scsi: remove driver_data direct access of struct device
  pcmcia: remove driver_data direct access of struct device
  PCIE: remove driver_data direct access of struct device
  ...

Manually fix up trivial conflicts due to different direct driver_data
direct access fixups in drivers/block/{ps3disk.c,ps3vram.c}
2009-06-16 12:57:37 -07:00
..
aoe Driver Core: aoe: add nodename for aoe devices 2009-06-15 21:30:26 -07:00
paride block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
amiflop.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
ataflop.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
brd.c ramdisk: remove long-deprecated "ramdisk=" boot-time parameter 2009-06-10 23:07:15 +02:00
cciss_cmd.h cciss: simplify interface of sendcmd() and sendcmd_withirq() 2009-06-09 05:47:42 +02:00
cciss_scsi.c cciss: decode unit attention in SCSI error handling code 2009-06-09 05:47:44 +02:00
cciss_scsi.h cciss: Fix cciss SCSI rescan code to better notice device changes 2008-10-09 08:56:18 +02:00
cciss.c block: remove some includings of blktrace_api.h 2009-06-16 11:19:36 +02:00
cciss.h cciss: Remove no longer needed sendcmd reject processing code 2009-06-09 05:47:43 +02:00
cpqarray.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
cpqarray.h
cryptoloop.c drivers: Remove unnecessary inclusions of asm/semaphore.h 2008-04-18 22:16:32 -04:00
DAC960.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
DAC960.h Fix DAC960 driver on machines which don't support 64-bit DMA 2007-09-11 17:21:19 -07:00
floppy.c floppy: fix hibernation 2009-06-10 23:07:16 +02:00
hd.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
ida_cmd.h
ida_ioctl.h
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-06-14 13:46:25 -07:00
loop.c splice: implement default splice_read method 2009-05-11 14:13:10 +02:00
Makefile mflash: initial support 2009-04-07 08:12:38 +02:00
mg_disk.c mg_disk: seperate mg_disk.h again 2009-06-16 08:40:20 +02:00
nbd.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
pktcdvd.c debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem. 2009-06-15 21:30:28 -07:00
ps3disk.c block/ps3: remove driver_data direct access of struct device 2009-06-15 21:30:28 -07:00
ps3vram.c block/ps3: remove driver_data direct access of struct device 2009-06-15 21:30:28 -07:00
smart1,2.h
sunvdc.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
swim3.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
swim_asm.S m68k: mac - Add SWIM floppy support 2009-03-26 21:15:27 +01:00
swim.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
sx8.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
ub.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
umem.c umem: fix request_queue lock warning 2009-04-24 08:54:21 +02:00
umem.h drivers/block/umem: trim trailing whitespace 2007-10-10 09:25:59 +02:00
viodasd.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
virtio_blk.c virtio_blk: add missing __dev{init,exit} markings 2009-06-12 22:16:39 +09:30
xd.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
xd.h [PATCH] switch xd 2008-10-21 07:48:11 -04:00
xen-blkfront.c xen block: remove driver_data direct access of struct device 2009-06-15 21:30:27 -07:00
xsysace.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
z2ram.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00