summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 19:50:24 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 19:50:24 +0100
commit7b0cb1bdac9e941141e3790785955ed933d476f3 (patch)
tree8652bdbe540f5552696b3b8827189eda4b2e01e4 /init
parentMerge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block (diff)
parentcciss: reinstate proper FIFO order of command queue list (diff)
downloadlinux-7b0cb1bdac9e941141e3790785955ed933d476f3.tar.xz
linux-7b0cb1bdac9e941141e3790785955ed933d476f3.zip
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions