Greg Kroah-Hartman 949c3676cd Staging: Merge branch 'staging-next' into 2.6.38-rc3 ... This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-02-02 13:35:58 -08:00
..
buffers.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
DefaultKeyAssignments	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
devsynth.c	staging: speakup: devsynth.c: style fixes	2010-10-12 10:50:41 -07:00
fakekey.c	fakekey: Simplify speakup_fake_key_pressed through this_cpu_ops	2010-12-17 15:07:19 +01:00
i18n.c	staging: speakup: i18n.c fix long lines	2010-10-19 10:06:04 -07:00
i18n.h	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
Kconfig	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
keyhelp.c	staging: speakup: keyhelp.c: style fixes	2010-10-12 10:50:42 -07:00
kobjects.c	Staging: speakup: &&/|| confusion in silent_store()	2011-01-20 12:06:07 -08:00
main.c	staging: speakup: more fixes for init-failure handling.	2011-01-20 15:58:16 -08:00
Makefile	Staging: speakup: Makefile: Makefile clean up	2010-10-08 07:26:24 -07:00
selection.c	staging: speakup: selection.c style fixes	2010-10-19 10:06:05 -07:00
serialio.c	staging: speakup: serialio.c style fixes	2010-10-19 10:06:05 -07:00
serialio.h	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
speakup.h	staging: speakup: main.c style fixes	2010-10-19 10:06:04 -07:00
speakup_acnt.h	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
speakup_acntpc.c	staging: speakup: speakup_acntpc.c: style fixes	2010-10-15 12:22:35 -07:00
speakup_acntsa.c	staging: speakup: speakup_acntsa.c: style fixes	2010-10-15 12:22:35 -07:00
speakup_apollo.c	staging: speakup: speakup_apollo.c: style fixes	2010-10-15 12:22:35 -07:00
speakup_audptr.c	staging: speakup: speakup_audptr.c: style fixes	2010-10-15 12:22:36 -07:00
speakup_bns.c	staging: speakup: speakup_bns.c: style fixes	2010-10-15 12:22:36 -07:00
speakup_decext.c	staging: speakup: speakup_decext.c: style fixes	2010-10-15 12:22:36 -07:00
speakup_decpc.c	staging: speakup: speakup_decpc.c: style fixes	2010-10-15 12:22:36 -07:00
speakup_dectlk.c	staging: speakup: speakup_dectlk.c: style fixes	2010-10-15 12:22:38 -07:00
speakup_dtlk.c	staging: speakup: speakup_dtlk.c: style fixes	2010-10-15 12:22:36 -07:00
speakup_dtlk.h	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
speakup_dummy.c	staging: speakup: speakup_dummy.c: style fixes	2010-10-15 12:22:37 -07:00
speakup_keypc.c	staging: speakup: speakup_keypc.c: style fixes	2010-10-15 12:22:37 -07:00
speakup_ltlk.c	staging: speakup: speakup_ltlk.c: style fixes	2010-10-15 12:22:37 -07:00
speakup_soft.c	staging: speakup: speakup_soft.c: style fixes	2010-10-15 12:22:37 -07:00
speakup_spkout.c	staging: speakup: speakup_spkout.c: style fixes	2010-10-15 12:22:38 -07:00
speakup_txprt.c	staging: speakup: speakup_txprt.c: style fixes	2010-10-15 12:22:38 -07:00
speakupmap.h	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
speakupmap.map	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
spk_priv.h	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
spk_priv_keyinfo.h	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
spk_types.h	Staging: speakup: spk_types: trival coding style issue	2010-11-09 16:38:40 -08:00
spkguide.txt	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
synth.c	staging: speakup: synth.c style fixes	2010-10-19 10:06:05 -07:00
thread.c	staging: speakup: thread.c style fixes	2010-10-19 10:06:05 -07:00
TODO	Staging: add speakup to the staging directory	2010-10-07 19:22:31 -07:00
varhandlers.c	staging: speakup: varhandlers.c style fixes	2010-10-19 10:06:05 -07:00