git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5ec5ec7
)
Staging: Add the Meilhaus ME-IDS driver package
author
David Kiliani
<mail@davidkiliani.de>
Fri, 31 Oct 2008 23:39:12 +0000
(
00:39
+0100)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 6 Jan 2009 21:52:29 +0000
(13:52 -0800)
Originally written by Guenter Gebhardt <g.gebhardt@meilhaus.de>
and Krzysztof Gantzke <k.gantzke@meilhaus.de>
This is the drv/lnx/mod directory of ME-IDS 1.2.9 tarball with
some files from drv/lnx/include.
Signed-off-by: David Kiliani <mail@davidkiliani.de>
Cc: Guenter Gebhardt <g.gebhardt@meilhaus.de>
Cc: Krzysztof Gantzke <k.gantzke@meilhaus.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
133 files changed:
drivers/staging/Kconfig
patch
|
blob
|
history
drivers/staging/Makefile
patch
|
blob
|
history
drivers/staging/meilhaus/Kconfig
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/Makefile
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/TODO
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_device.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_device.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_dio.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_dio.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_dio_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_ext_irq.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_ext_irq.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_ext_irq_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_optoi.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_optoi.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_optoi_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_relay.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_relay.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_relay_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_ttli.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_ttli.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0600_ttli_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0900_device.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0900_device.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0900_di.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0900_di.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0900_do.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0900_do.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me0900_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1000_device.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1000_device.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1000_dio.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1000_dio.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1000_dio_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1400_device.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1400_device.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1400_ext_irq.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1400_ext_irq.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1400_ext_irq_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1600_ao.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1600_ao.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1600_ao_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1600_device.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me1600_device.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_ai.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_ai.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_ai_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_ao.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_ao.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_ao_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_device.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_device.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_di.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_di.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_dio.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_dio.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_dio_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_do.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_do.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_ext_irq.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_ext_irq.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_ext_irq_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me4600_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me6000_ao.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me6000_ao.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me6000_ao_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me6000_device.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me6000_device.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me6000_dio.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me6000_dio.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me6000_dio_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me6000_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8100_device.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8100_device.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8100_di.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8100_di.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8100_di_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8100_do.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8100_do.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8100_do_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8100_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_device.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_device.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_di.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_di.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_di_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_dio.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_dio.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_dio_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_do.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_do.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_do_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8200_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8254.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8254.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8254_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8255.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8255.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/me8255_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/mecirc_buf.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/mecommon.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medebug.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medefines.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medevice.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medevice.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medlist.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medlist.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medlock.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medlock.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medriver.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medummy.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/medummy.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/meerror.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/mefirmware.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/mefirmware.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/meids.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/meinternal.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/meioctl.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/memain.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/memain.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/meplx_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/meslist.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/meslist.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/meslock.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/meslock.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/mesubdevice.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/mesubdevice.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/metempl_device.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/metempl_device.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/metempl_sub.c
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/metempl_sub.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/metempl_sub_reg.h
[new file with mode: 0644]
patch
|
blob
drivers/staging/meilhaus/metypes.h
[new file with mode: 0644]
patch
|
blob
diff --cc
drivers/staging/Kconfig
Simple merge
diff --cc
drivers/staging/Makefile
Simple merge
diff --cc
drivers/staging/meilhaus/Kconfig
Simple merge
diff --cc
drivers/staging/meilhaus/Makefile
Simple merge
diff --cc
drivers/staging/meilhaus/TODO
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_device.c
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_device.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_dio.c
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_dio.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_dio_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_ext_irq.c
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_ext_irq.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_ext_irq_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_optoi.c
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_optoi.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_optoi_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_relay.c
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_relay.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_relay_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_ttli.c
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_ttli.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0600_ttli_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0900_device.c
Simple merge
diff --cc
drivers/staging/meilhaus/me0900_device.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0900_di.c
Simple merge
diff --cc
drivers/staging/meilhaus/me0900_di.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0900_do.c
Simple merge
diff --cc
drivers/staging/meilhaus/me0900_do.h
Simple merge
diff --cc
drivers/staging/meilhaus/me0900_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me1000_device.c
Simple merge
diff --cc
drivers/staging/meilhaus/me1000_device.h
Simple merge
diff --cc
drivers/staging/meilhaus/me1000_dio.c
Simple merge
diff --cc
drivers/staging/meilhaus/me1000_dio.h
Simple merge
diff --cc
drivers/staging/meilhaus/me1000_dio_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me1400_device.c
Simple merge
diff --cc
drivers/staging/meilhaus/me1400_device.h
Simple merge
diff --cc
drivers/staging/meilhaus/me1400_ext_irq.c
Simple merge
diff --cc
drivers/staging/meilhaus/me1400_ext_irq.h
Simple merge
diff --cc
drivers/staging/meilhaus/me1400_ext_irq_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me1600_ao.c
Simple merge
diff --cc
drivers/staging/meilhaus/me1600_ao.h
Simple merge
diff --cc
drivers/staging/meilhaus/me1600_ao_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me1600_device.c
Simple merge
diff --cc
drivers/staging/meilhaus/me1600_device.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_ai.c
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_ai.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_ai_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_ao.c
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_ao.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_ao_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_device.c
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_device.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_di.c
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_di.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_dio.c
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_dio.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_dio_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_do.c
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_do.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_ext_irq.c
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_ext_irq.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_ext_irq_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me4600_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me6000_ao.c
Simple merge
diff --cc
drivers/staging/meilhaus/me6000_ao.h
Simple merge
diff --cc
drivers/staging/meilhaus/me6000_ao_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me6000_device.c
Simple merge
diff --cc
drivers/staging/meilhaus/me6000_device.h
Simple merge
diff --cc
drivers/staging/meilhaus/me6000_dio.c
Simple merge
diff --cc
drivers/staging/meilhaus/me6000_dio.h
Simple merge
diff --cc
drivers/staging/meilhaus/me6000_dio_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me6000_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8100_device.c
Simple merge
diff --cc
drivers/staging/meilhaus/me8100_device.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8100_di.c
Simple merge
diff --cc
drivers/staging/meilhaus/me8100_di.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8100_di_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8100_do.c
Simple merge
diff --cc
drivers/staging/meilhaus/me8100_do.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8100_do_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8100_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_device.c
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_device.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_di.c
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_di.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_di_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_dio.c
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_dio.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_dio_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_do.c
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_do.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_do_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8200_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8254.c
Simple merge
diff --cc
drivers/staging/meilhaus/me8254.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8254_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8255.c
Simple merge
diff --cc
drivers/staging/meilhaus/me8255.h
Simple merge
diff --cc
drivers/staging/meilhaus/me8255_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/mecirc_buf.h
Simple merge
diff --cc
drivers/staging/meilhaus/mecommon.h
Simple merge
diff --cc
drivers/staging/meilhaus/medebug.h
Simple merge
diff --cc
drivers/staging/meilhaus/medefines.h
Simple merge
diff --cc
drivers/staging/meilhaus/medevice.c
Simple merge
diff --cc
drivers/staging/meilhaus/medevice.h
Simple merge
diff --cc
drivers/staging/meilhaus/medlist.c
Simple merge
diff --cc
drivers/staging/meilhaus/medlist.h
Simple merge
diff --cc
drivers/staging/meilhaus/medlock.c
Simple merge
diff --cc
drivers/staging/meilhaus/medlock.h
Simple merge
diff --cc
drivers/staging/meilhaus/medriver.h
Simple merge
diff --cc
drivers/staging/meilhaus/medummy.c
Simple merge
diff --cc
drivers/staging/meilhaus/medummy.h
Simple merge
diff --cc
drivers/staging/meilhaus/meerror.h
Simple merge
diff --cc
drivers/staging/meilhaus/mefirmware.c
Simple merge
diff --cc
drivers/staging/meilhaus/mefirmware.h
Simple merge
diff --cc
drivers/staging/meilhaus/meids.h
Simple merge
diff --cc
drivers/staging/meilhaus/meinternal.h
Simple merge
diff --cc
drivers/staging/meilhaus/meioctl.h
Simple merge
diff --cc
drivers/staging/meilhaus/memain.c
Simple merge
diff --cc
drivers/staging/meilhaus/memain.h
Simple merge
diff --cc
drivers/staging/meilhaus/meplx_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/meslist.c
Simple merge
diff --cc
drivers/staging/meilhaus/meslist.h
Simple merge
diff --cc
drivers/staging/meilhaus/meslock.c
Simple merge
diff --cc
drivers/staging/meilhaus/meslock.h
Simple merge
diff --cc
drivers/staging/meilhaus/mesubdevice.c
Simple merge
diff --cc
drivers/staging/meilhaus/mesubdevice.h
Simple merge
diff --cc
drivers/staging/meilhaus/metempl_device.c
Simple merge
diff --cc
drivers/staging/meilhaus/metempl_device.h
Simple merge
diff --cc
drivers/staging/meilhaus/metempl_sub.c
Simple merge
diff --cc
drivers/staging/meilhaus/metempl_sub.h
Simple merge
diff --cc
drivers/staging/meilhaus/metempl_sub_reg.h
Simple merge
diff --cc
drivers/staging/meilhaus/metypes.h
Simple merge