Greg Kroah-Hartman 7ca363f687 Merge branch 'staging-linus' into staging-work ...

This is to pull in the lustre fixes so that others can continue to work
on updating the lustre codebase, as well as resolve some merge issues
with the ion and ocproto drivers to keep linux-next happy.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2014-02-08 13:38:28 -08:00

..

core

Merge branch 'staging-linus' into staging-work

2014-02-08 13:38:28 -08:00

hal

staging: r8188eu: Remove ODM_InitializeTimer

2014-02-07 10:44:31 -08:00

include

staging: r8188eu: Remove ODM_InitializeTimer

2014-02-07 10:44:31 -08:00

os_dep

Merge branch 'staging-linus' into staging-work

2014-02-08 13:38:28 -08:00

Kconfig

staging: r8188eu: Insert Kconfig files for new driver

2013-08-22 10:20:31 -07:00

Makefile

drivers: staging: rtl8188eu: use 'ccflags-y' instead of EXTRA_CFLAGS in Makefile

2013-10-27 07:12:58 -07:00

TODO

staging: r8188eu: Convert driver to use external firmware

2013-10-14 09:34:15 -07:00