Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 03:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
97c5e2756e
linux/drivers/staging/dt3155
History
Greg Kroah-Hartman c8d1a12692 Merge staging-next tree into Linus's latest version 
Conflicts:
	drivers/staging/arlan/arlan-main.c
	drivers/staging/comedi/drivers/cb_das16_cs.c
	drivers/staging/cx25821/cx25821-alsa.c
	drivers/staging/dt3155/dt3155_drv.c
	drivers/staging/hv/hv.c
	drivers/staging/netwave/netwave_cs.c
	drivers/staging/wavelan/wavelan.c
	drivers/staging/wavelan/wavelan_cs.c
	drivers/staging/wlags49_h2/wl_cs.c

This required a bit of hand merging due to the conflicts
that happened in the later .34-rc releases, as well as
some staging driver changing coming in through other trees
(v4l and pcmcia).

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-21 12:48:55 -07:00
..
allocator.c Staging: dt3155: allocator.c: sparse cleanups 2010-05-11 11:35:40 -07:00
allocator.h Staging: dt3155: allocator.c: sparse cleanups 2010-05-11 11:35:40 -07:00
allocator.README
dt3155_drv.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
dt3155_drv.h Staging: dt3155: replace u_int and u_long usage 2010-03-03 16:42:56 -08:00
dt3155_io.c Staging: dt3155: fix wait_ibsyclr function 2010-05-11 11:35:36 -07:00
dt3155_io.h staging: dt3155: revert u_long to u64 usage 2010-03-03 16:43:07 -08:00
dt3155_isr.c Staging: dt3155: remove "inline" usage 2010-05-11 11:35:41 -07:00
dt3155_isr.h Staging: dt3155: rename dt3155_fbuffer_s 2010-05-11 11:35:41 -07:00
dt3155.h Staging: dt3155: rename dt3155_fbuffer_s 2010-05-11 11:35:41 -07:00
dt3155.sysvinit
Kconfig Staging: dt3155: add it to the build 2010-03-03 16:42:31 -08:00
Makefile Staging: dt3155: add it to the build 2010-03-03 16:42:31 -08:00
TODO Staging: dt3155: add TODO file 2010-03-03 16:42:31 -08:00