1
0
Files
linux/arch/powerpc/include/asm
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
..
2010-08-04 10:26:03 +10:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-06-20 11:21:48 +10:00
2011-07-26 16:49:47 -07:00
2011-11-08 14:51:46 +11:00
2009-12-10 20:08:15 -06:00
2010-10-26 16:52:08 -07:00
2011-03-02 16:50:24 +11:00
2011-07-26 16:49:47 -07:00
2011-12-08 14:02:23 +11:00
2011-03-31 11:26:23 -03:00
2011-05-22 08:47:53 -04:00
2010-05-17 12:18:23 +03:00
2010-06-09 11:12:36 +02:00
2011-07-26 16:49:47 -07:00
2010-05-05 09:11:10 -04:00
2011-09-20 09:19:40 +10:00
2011-12-07 18:02:02 +11:00
2011-03-31 11:26:23 -03:00
2010-03-05 03:04:08 -06:00
2010-10-26 16:52:08 -07:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2009-12-09 17:10:37 +11:00
2011-09-20 09:19:40 +10:00
2011-09-27 18:08:04 +02:00
2010-03-05 03:04:08 -06:00
2011-12-09 07:51:02 -05:00
2011-04-20 17:01:19 +10:00
2011-03-31 11:26:23 -03:00
2009-08-28 14:24:10 +10:00
2011-10-31 17:30:44 -07:00
2011-12-16 11:09:21 +11:00
2011-10-31 17:30:44 -07:00
2011-03-31 11:26:23 -03:00
2011-05-06 13:32:35 +10:00
2011-11-08 14:51:46 +11:00