projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f618ef7 c869494)
Merge branch 'for-3.13/post-mq-drivers' into for-linus
authorJens Axboe <axboe@kernel.dk>
Thu, 14 Nov 2013 15:29:01 +0000 (08:29 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 14 Nov 2013 15:29:01 +0000 (08:29 -0700)
1  2 
drivers/block/Kconfig patch | diff1 | diff2 | blob | history
drivers/block/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/block/Kconfig
Simple merge
diff --cc drivers/block/Makefile
index 03b3b4a2bd8ae354d7647d3ef4552202d8ea97f0,f33b3669428901ec252422e39266f19eaad1a613..8cc98cd0d4a8578485694e95735af1fd25514bff
--- 1/drivers/block/Makefile
--- 2/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@@ -41,7 -42,7 +42,8 @@@ obj-$(CONFIG_BLK_DEV_RBD)     += rbd.
  obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX)        += mtip32xx/
  
  obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
 +obj-$(CONFIG_BLK_DEV_NULL_BLK)        += null_blk.o
  
  nvme-y                := nvme-core.o nvme-scsi.o
+ skd-y         := skd_main.o
  swim_mod-y    := swim.o swim_asm.o