Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 17:37:40 +0000 (10:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 17:37:40 +0000 (10:37 -0700)
commite16b396ce314b2bcdfe6c173fe075bf8e3432368
tree640f0f56f2ea676647af4eb42d32fa56be2ee549
parent7fd23a24717a327a66f3c32d11a20a2f169c824f
parente6e8dd5055a974935af1398c8648d4a9359b0ecb
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: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
30 files changed:
MAINTAINERS
Makefile
arch/x86/kernel/apic/io_apic.c
drivers/bluetooth/btusb.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_ring.c
drivers/gpu/drm/radeon/rs600.c
drivers/gpu/drm/radeon/rs690.c
drivers/gpu/drm/radeon/rv770.c
drivers/net/qla3xxx.c
drivers/net/sungem.h
drivers/platform/x86/acer-wmi.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/target/target_core_hba.c
drivers/tty/hvc/hvcs.c
drivers/tty/serial/pch_uart.c
fs/btrfs/disk-io.c
fs/dcache.c
fs/eventpoll.c
init/Kconfig
kernel/trace/ring_buffer.c
mm/memory.c
mm/mempolicy.c
mm/shmem.c
net/core/dev_addr_lists.c
net/mac80211/tx.c
sound/pci/au88x0/au88x0_core.c