kevin/linux
1
Fork 0
Code
aa456a6eba
linux/drivers/staging/speakup
History
Linus Torvalds 949f6711b8 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
  staging: speakup: fix failure handling
  staging: usbip: remove double giveback of URB
  Staging: batman-adv: Remove batman-adv from staging
  Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
  staging: hv: remove unneeded osd_schedule_callback
  staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
  staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
  staging: brcm80211: Fix WL_<type> logging macros
  Staging: IIO: DDS: AD9833 / AD9834 driver
  Staging: IIO: dds.h convenience macros
  Staging: IIO: Direct digital synthesis abi documentation
  staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
  staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
  staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
  staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
  staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
  staging: brcm80211: Remove unused ether_<foo> #defines and struct
  staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
  staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
  Staging: comedi: Fix checkpatch.pl issues in file s526.c
  ...

Fix up trivial conflict in drivers/video/udlfb.c
2011-01-10 16:04:53 -08:00
..
buffers.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
DefaultKeyAssignments
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
Kconfig
keyhelp.c staging: speakup: keyhelp.c: style fixes 2010-10-12 10:50:42 -07:00
kobjects.c staging: speakup: fix failure handling 2011-01-10 12:26:10 -08:00
main.c staging: speakup: fix failure handling 2011-01-10 12:26:10 -08:00
Makefile
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
speakup_acnt.h
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
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
speakup.h staging: speakup: main.c style fixes 2010-10-19 10:06:04 -07:00
speakupmap.h
speakupmap.map
spk_priv_keyinfo.h
spk_priv.h
spk_types.h Staging: speakup: spk_types: trival coding style issue 2010-11-09 16:38:40 -08:00
spkguide.txt
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
varhandlers.c staging: speakup: varhandlers.c style fixes 2010-10-19 10:06:05 -07:00