]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/sh/intc/dynamic.c
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)
commit7b0cb1bdac9e941141e3790785955ed933d476f3
tree8652bdbe540f5552696b3b8827189eda4b2e01e4
parent275220f0fcff1adf28a717076e00f575edf05fda
parente6e1ee936d61d697735d17517678a626b7701ce4
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