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
..
2011-09-09 11:45:47 +02:00
2011-06-09 14:04:47 -04:00
2005-04-16 15:20:36 -07:00
2011-03-31 11:26:23 -03:00
2011-05-19 15:59:38 -07:00
2005-04-16 15:20:36 -07:00
2010-10-28 00:32:23 +02:00
2008-07-25 22:12:41 +02:00
2011-06-16 20:40:03 +02:00
2011-08-31 16:12:17 +02:00
2009-06-09 22:37:54 +02:00
2010-03-23 12:26:38 +01:00
2011-06-09 14:04:38 -04:00
2011-03-31 11:26:23 -03:00
2008-04-25 20:18:48 +02:00
2005-04-16 15:20:36 -07:00
2009-06-09 22:37:54 +02:00