kernel-fxtec-pro1x/Documentation/zh_CN
Linus Torvalds d3ec4844d4 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: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
CodingStyle Chinese: add translation of Codingstyle 2008-01-24 20:40:04 -08:00
email-clients.txt Translated Documentation/email-clients.txt 2011-05-06 17:59:20 -07:00
HOWTO Docs/Kconfig: Update: osdl.org -> linuxfoundation.org 2010-11-15 23:50:13 +01:00
magic-number.txt doc: fix wrong arch/i386 references 2011-06-13 13:43:05 +02:00
oops-tracing.txt Chinese: add translation of oops-tracing.txt 2008-01-24 20:40:03 -08:00
SecurityBugs Translate Documentation/SecurityBugs into Chinese 2011-02-03 15:44:22 -08:00
sparse.txt update email address 2010-07-19 10:56:54 +02:00
stable_api_nonsense.txt
stable_kernel_rules.txt Chinese: add translation of stable_kernel_rules.txt 2008-01-24 20:40:03 -08:00
SubmitChecklist sched: Generalize sleep inside spinlock detection 2011-06-23 00:44:38 +02:00
SubmittingDrivers Docs/Kconfig: Update: osdl.org -> linuxfoundation.org 2010-11-15 23:50:13 +01:00
SubmittingPatches Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches 2011-02-28 19:30:48 -08:00
volatile-considered-harmful.txt Chinese: add translation of volatile-considered-harmful.txt 2008-01-24 20:40:03 -08:00