From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Jan 2011 18:50:24 +0000 (-0800)
Subject: Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.38-rc1~230
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=7b0cb1bdac9e941141e3790785955ed933d476f3

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
---

7b0cb1bdac9e941141e3790785955ed933d476f3