]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 18:50:24 +0000 (10:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 18:50:24 +0000 (10:50 -0800)
commit1107c42300b4776e8dc91fbd272f7c3b1985f9d2
tree8652bdbe540f5552696b3b8827189eda4b2e01e4
parent1b128c5ad30f46a6a9bf7ecbee14f3b83fd0fa7c
parentb1cf286e89d4840966bbc557480bd5c7f62d23f3
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
drivers/block/cciss.c
drivers/block/cciss.h
drivers/block/floppy.c