Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block:
  cciss: reinstate proper FIFO order of command queue list
  floppy: replace NO_GEOM macro with a function

diff --cc drivers/block/cciss.c
Simple merge

diff --cc drivers/block/cciss.h
Simple merge

diff --cc drivers/block/floppy.c
Simple merge