Merge by hand (conflicts in scsi_lib.c)
[profile/ivi/kernel-adaptation-intel-automotive.git] / drivers / sbus /
drwxr-xr-x   ..
-rw-r--r-- 124 Makefile
drwxr-xr-x - char
-rw-r--r-- 2818 dvma.c
-rw-r--r-- 15322 sbus.c