OpenCloudOS-Kernel/drivers/staging/keucr
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
..
Kconfig Staging: Remove ENE UB6250 MS card codes from keucr 2011-07-08 14:12:52 -07:00
Makefile Staging: Remove ENE UB6250 MS card codes from keucr 2011-07-08 14:12:52 -07:00
TODO staging: keucr: use kernel byteorder functions 2011-03-07 13:26:56 -08:00
common.h staging/keucr: eliminate sparse warnings in ms.c 2011-05-10 11:19:54 -07:00
init.c Staging: Remove ENE UB6250 MS card codes from keucr 2011-07-08 14:12:52 -07:00
init.h Staging: Remove ENE UB6250 MS card codes from keucr 2011-07-08 14:12:52 -07:00
scsiglue.c Staging: keucr: Coding style fixes in scsiglue.c 2011-08-23 14:38:44 -07:00
scsiglue.h Staging: add USB ENE card reader driver 2010-09-08 02:49:39 -07:00
smcommon.h staging/keucr: don't use SUCCESS as macro name 2011-05-10 11:25:06 -07:00
smil.h Staging: keucr: Coding style fixes in smil.h 2011-08-23 14:38:44 -07:00
smilecc.c staging/keucr: fix keucr smilecc.c coding style 2011-05-18 08:22:39 -07:00
smilmain.c misc latin1 to utf8 conversions 2012-01-02 13:04:55 +01:00
smilsub.c Staging: keucr: fix comments, braces, whitespaces coding style issue in tm6000.h 2011-08-23 14:38:45 -07:00
smscsi.c Staging: keucr: Coding style fixes in smscsi.c 2011-08-23 14:38:43 -07:00
transport.c Staging: Remove ENE UB6250 MS card codes from keucr 2011-07-08 14:12:52 -07:00
transport.h Staging: Remove ENE UB6250 MS card codes from keucr 2011-07-08 14:12:52 -07:00
usb.c USB: convert drivers/staging/* to use module_usb_driver() 2011-11-18 09:42:11 -08:00
usb.h Staging: Remove ENE UB6250 MS card codes from keucr 2011-07-08 14:12:52 -07:00