alistair23-linux/drivers/staging/ft1000/ft1000-usb
Linus Torvalds 98793265b4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
2012-01-08 13:21:22 -08:00
..
ft1000_debug.c staging: ft1000: Replace camelcase CardSendCommand function name. 2011-03-14 11:51:14 -07:00
ft1000_download.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ft1000_hw.c treewide: Fix typos in various parts of the kernel, and fix some comments. 2011-12-02 14:57:31 +01:00
ft1000_ioctl.h staging: ft1000: Merge common definitions from USB and PCMCIA drivers 2011-07-05 10:33:46 -07:00
ft1000_proc.c staging: ft1000: Fix return values type. 2011-02-09 14:55:49 -08:00
ft1000_usb.c USB: convert drivers/staging/* to use module_usb_driver() 2011-11-18 09:42:11 -08:00
ft1000_usb.h staging: ft1000: Merge common definitions from USB and PCMCIA drivers 2011-07-05 10:33:46 -07:00
ft3000.img Staging: Add support for Flarion OFDM usb and pcmcia devices. 2010-09-22 08:24:30 -07:00
Makefile staging: ft1000: Rename ft1000_chdev.c to ft1000_debug.c. 2010-12-16 12:18:25 -08:00