1
0
Fork 0
alistair23-linux/Documentation/zh_CN
Linus Torvalds 158c12948f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree changes from Jiri Kosina:
 "Summer edition of trivial tree updates"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
  doc: fix two typos in watchdog-api.txt
  irq-gic: remove file name from heading comment
  MAINTAINERS: Add miscdevice.h to file list for char/misc drivers.
  scsi: mvsas: mv_sas.c: Fix for possible null pointer dereference
  doc: replace "practise" with "practice" in Documentation
  befs: remove check for CONFIG_BEFS_RW
  scsi: doc: fix 'SCSI_NCR_SETUP_MASTER_PARITY'
  drivers/usb/phy/phy.c: remove a leading space
  mfd: fix comment
  cpuidle: fix comment
  doc: hpfall.c: fix missing null-terminate after strncpy call
  usb: doc: hotplug.txt code typos
  kbuild: fix comment in Makefile.modinst
  SH: add proper prompt to SH_MAGIC_PANEL_R2_VERSION
  ARM: msm: Remove MSM_SCM
  crypto: Remove MPILIB_EXTRA
  doc: CN: remove dead link, kerneltrap.org no longer works
  media: update reference, kerneltrap.org no longer works
  hexagon: update reference, kerneltrap.org no longer works
  doc: LSM: update reference, kerneltrap.org no longer works
  ...
2014-08-06 21:03:53 -07:00
..
arm Documentation: Chinese translation of Documentation/arm/kernel_user_helpers.txt 2012-11-15 17:46:42 -08:00
arm64 Documentation:Update Documentation/zh_CN/arm64/memory.txt 2014-02-07 15:24:31 -08:00
filesystems Documentation: Chinese translation of Documentation/filesystems/sysfs.txt 2012-09-04 16:08:29 -07:00
video4linux [media] media: Documentation: remove V4L2_FL_USE_FH_PRIO flag 2014-07-04 16:16:11 -03:00
CodingStyle Documentation: remove depends on CONFIG_EXPERIMENTAL 2013-01-11 11:38:03 -08:00
HOWTO Documentation: Update stable address in Chinese and Japanese translations 2014-04-16 14:13:27 -07:00
IRQ.txt Documentation:Chinese translation of Documentation/IRQ.txt 2012-10-25 11:54:06 -07:00
SecurityBugs Translate Documentation/SecurityBugs into Chinese 2011-02-03 15:44:22 -08:00
SubmittingDrivers doc: CN: remove dead link, kerneltrap.org no longer works 2014-06-19 15:15:28 +02:00
SubmittingPatches Documentation/SubmittingPatches: remove references to patch-scripts 2014-04-03 16:21:27 -07:00
basic_profiling.txt Document:add Chinese translation of basic_profiling.txt 2012-09-06 15:09:25 -07:00
email-clients.txt Documentation/zh_CN: Fix messy code file email-clients.txt 2011-07-01 15:15:56 -07:00
gpio.txt gpio: update gpio Chinese documentation 2013-04-16 18:47:22 +09:00
io_ordering.txt Chinese: add translation of io_ordering.txt 2014-04-16 14:13:26 -07:00
magic-number.txt Documentation/serial: Delete obsolete driver documentation 2014-04-16 14:20:34 -07:00
oops-tracing.txt Chinese: add translation of oops-tracing.txt 2008-01-24 20:40:03 -08:00
sparse.txt update email address 2010-07-19 10:56:54 +02:00
stable_api_nonsense.txt Chinese translation of Documentation/stable_api_nonsense.txt 2007-07-18 16:02:12 -07:00
stable_kernel_rules.txt Documentation: Update stable address in Chinese and Japanese translations 2014-04-16 14:13:27 -07:00
volatile-considered-harmful.txt Chinese: add translation of volatile-considered-harmful.txt 2008-01-24 20:40:03 -08:00