Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Nov 2010 22:17:50 +0000 (07:17 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Nov 2010 22:17:50 +0000 (07:17 +0900)
commit78daa87b1d332e4ac963c793a4157533d57501c7
treec133840b219a446c11fa2391bb0d887e71f5809f
parentd4d2ad948e9a9c316e72fdc09d7490dfda4773da
parentbbe425cd9ae83eacd0c9f09df2bf56dc911a54cd
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  cciss: fix build for PROC_FS disabled
  block: fix amiga and atari floppy driver compile warning
  blk-throttle: Fix calculation of max number of WRITES to be dispatched
  ioprio: grab rcu_read_lock in sys_ioprio_{set,get}()
  xen/blkfront: cope with backend that fail empty BLKIF_OP_WRITE_BARRIER requests
  xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER
  xen/blkfront: change blk_shadow.request to proper pointer
  xen/blkfront: map REQ_FLUSH into a full barrier