Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next ... This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-05-02 11:48:07 -07:00
..
Kconfig	staging: sep: SEP update	2012-01-30 14:00:03 -08:00
Makefile	staging: sep: SEP update	2012-01-30 14:00:03 -08:00
TODO	staging: sep: SEP update	2012-01-30 14:00:03 -08:00
sep_crypto.c	staging: Fix SEP build	2012-02-13 14:42:02 -08:00
sep_crypto.h	staging: sep: reworked crypto layer	2012-02-10 10:09:58 -08:00
sep_dev.h	staging: sep: reworked crypto layer	2012-02-10 10:09:58 -08:00
sep_driver_api.h	staging: sep: Basic infrastructure for SEP DMA access to non CPU regions	2012-02-10 10:09:57 -08:00
sep_driver_config.h	staging, sep: Fix typo in sep	2012-04-24 11:28:24 -07:00
sep_driver_hw_defs.h	staging: sep: Add new PCI identifier	2012-02-10 10:09:56 -08:00
sep_main.c	Merge 3.4-rc5 into staging-next	2012-05-02 11:48:07 -07:00
sep_trace_events.h	staging: sep: SEP update	2012-01-30 14:00:03 -08:00