summaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-18 21:01:02 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-18 21:01:02 +0100
commit69098bac169d630a777b362470f20451b9446e39 (patch)
treeaf916fdbdb51940ec6050628401d300c83d129a9 /drivers/block/cciss.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentavr32: favr-32 build fix (diff)
downloadlinux-69098bac169d630a777b362470f20451b9446e39.tar.xz
linux-69098bac169d630a777b362470f20451b9446e39.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: favr-32 build fix ATSTK1006: Fix boot from NAND flash avr32: remove .note.gnu.build-id section when making vmlinux.bin avr32: Enable pullup on USART TX lines
Diffstat (limited to 'drivers/block/cciss.c')
0 files changed, 0 insertions, 0 deletions