projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 275220f e6e1ee9)
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)
* '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

1  2 
drivers/block/cciss.c patch | diff1 | diff2 | blob | history
drivers/block/cciss.h patch | diff1 | diff2 | blob | history
drivers/block/floppy.c patch | diff1 | diff2 | blob | history

diff --cc drivers/block/cciss.c
Simple merge
diff --cc drivers/block/cciss.h
Simple merge
diff --cc drivers/block/floppy.c
Simple merge
Domain: System / Uncategorized;