Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ...

This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-10-28 09:44:56 -07:00

..

Kconfig

Staging: quickstart: depends on INPUT

2010-08-02 18:12:46 -07:00

Makefile

Staging: quickstart: add the quickstart driver to the build

2010-07-08 16:25:55 -07:00

quickstart.c

Merge 'staging-next' to Linus's tree

2010-10-28 09:44:56 -07:00