tmp_suning_uos_patched/arch/xtensa
Linus Torvalds e16b396ce3 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: (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)
2011-03-18 10:37:40 -07:00
..
boot xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
configs Merge branch 'master' into for-next 2011-02-15 10:24:31 +01:00
include/asm Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-03-16 15:11:04 -07:00
kernel Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2011-03-16 08:22:41 -07:00
lib xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
mm xtensa: invoke oom-killer from page fault 2010-06-04 15:21:44 -07:00
platforms xtensa: Fix the network driver for the simulator target 2010-05-02 08:37:20 -07:00
variants xtensa: support s6000 gpio irqs and alternate function selection 2009-06-22 02:37:26 -07:00
Kconfig Merge branch 'kbuild/rc-fixes' into kbuild/kconfig 2010-10-12 15:09:06 +02:00
Kconfig.debug
Makefile xtensa: Add -mforce-no-pic option is supported 2010-05-02 01:00:22 -07:00