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

…

Makefile

…

sep_crypto.c

…

sep_crypto.h

…

sep_dev.h

…

sep_driver_api.h

…

sep_driver_config.h

staging, sep: Fix typo in sep

2012-04-24 11:28:24 -07:00

sep_driver_hw_defs.h

…

sep_main.c

Merge 3.4-rc5 into staging-next

2012-05-02 11:48:07 -07:00

sep_trace_events.h

…

TODO

…