Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jan 2012 21:21:22 +0000 (13:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jan 2012 21:21:22 +0000 (13:21 -0800)
commit98793265b429a3f0b3f1750e74d67cd4d740d162
treeb0bd717673f0c21845cf053f3fb6b75d42530af5
parentb4a133da2eaccb844a7beaef16ffd9c76a0d21d3
parentbd1b2a555952d959f47169056fca05acf7eff81f
Merge branch 'for-linus' of git://git./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)
39 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/mips/Kconfig
arch/powerpc/mm/numa.c
arch/powerpc/platforms/40x/Kconfig
arch/powerpc/platforms/44x/Kconfig
arch/s390/Kconfig
drivers/gpio/Kconfig
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
drivers/scsi/qla2xxx/qla_nx.c
drivers/scsi/qla4xxx/ql4_fw.h
drivers/spi/Kconfig
drivers/tty/serial/Kconfig
drivers/usb/gadget/Kconfig
drivers/usb/host/hwa-hc.c
drivers/usb/serial/ftdi_sio_ids.h
drivers/usb/storage/isd200.c
drivers/usb/storage/unusual_devs.h
drivers/uwb/i1480/dfu/usb.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/ext4/inode.c
fs/fat/inode.c
fs/namespace.c
fs/ocfs2/file.c
fs/qnx4/inode.c
fs/xfs/xfs_buf.c
fs/xfs/xfs_log_cil.c
include/linux/security.h
include/linux/types.h
include/net/mac80211.h
kernel/events/core.c
kernel/events/ring_buffer.c
kernel/irq/manage.c
lib/Kconfig
mm/page_alloc.c
net/ipv4/Kconfig
net/ipv4/netfilter/nf_nat_core.c
net/netfilter/ipvs/Kconfig