android_kernel_xiaomi_sm8350/drivers/block
Linus Torvalds e16b396ce3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
2011-03-18 10:37:40 -07:00
..
aoe drivers/block/aoe/Makefile: replace the use of <module>-objs with <module>-y 2011-01-19 08:25:02 -07:00
drbd netlink: kill eff_cap from struct netlink_skb_parms 2011-03-03 13:32:07 -08: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 m68k/block: amiflop - Remove superfluous amiga_chip_alloc() cast 2011-03-16 19:11:25 +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_cmd.h cciss: reinstate proper FIFO order of command queue list 2011-01-10 21:50:33 +01:00
cciss_scsi.c SCSI host lock push-down 2010-11-16 13:33:23 -08:00
cciss_scsi.h
cciss.c cciss: make cciss_revalidate not loop through CISS_MAX_LUNS volumes unnecessarily. 2011-01-19 08:25:02 -07:00
cciss.h Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block 2011-01-13 10:50:24 -08:00
cpqarray.c
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 Fix over-zealous flush_disk when changing device size. 2011-02-24 17:25:47 +11:00
hd.c
ida_cmd.h
ida_ioctl.h
Kconfig xen: separate out frontend xenbus 2011-01-05 16:29:17 -05:00
loop.c block: kill loop_mutex 2011-03-03 11:53:25 -05:00
Makefile drivers/block/Makefile: replace the use of <module>-objs with <module>-y 2011-01-19 08:25:02 -07:00
mg_disk.c
nbd.c nbd: remove module-level ioctl mutex 2011-02-11 16:12:20 -08:00
osdblk.c
pktcdvd.c block: make blkdev_get/put() handle exclusive access 2010-11-13 11:55:17 +01: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_types.h
rbd.c rbd: fix cleanup when trying to mount inexistent image 2011-01-12 15:15:18 -08:00
smart1,2.h fix typos 'comamnd' -> 'command' in comments 2011-02-02 11:31:21 +01:00
sunvdc.c
swim3.c
swim_asm.S
swim.c
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
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
xd.h
xen-blkfront.c Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm 2011-03-15 10:59:09 -07:00
xsysace.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
z2ram.c drivers/block/z2ram.c: correct printing of sector_t 2010-10-28 06:15:26 -06:00