diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 18:36:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 18:36:28 +0200 |
| commit | 2e515bf096c245ba87f20ab4b4ea20f911afaeda (patch) | |
| tree | 8ce40f811092844ea9da683804db6e2afa410808 /CREDITS | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| parent | doc: Documentation/cputopology.txt fix typo (diff) | |
| download | linux-2e515bf096c245ba87f20ab4b4ea20f911afaeda.tar.xz linux-2e515bf096c245ba87f20ab4b4ea20f911afaeda.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"The usual trivial updates all over the tree -- mostly typo fixes and
documentation updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
doc: Documentation/cputopology.txt fix typo
treewide: Convert retrun typos to return
Fix comment typo for init_cma_reserved_pageblock
Documentation/trace: Correcting and extending tracepoint documentation
mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
power: Documentation: Update s2ram link
doc: fix a typo in Documentation/00-INDEX
Documentation/printk-formats.txt: No casts needed for u64/s64
doc: Fix typo "is is" in Documentations
treewide: Fix printks with 0x%#
zram: doc fixes
Documentation/kmemcheck: update kmemcheck documentation
doc: documentation/hwspinlock.txt fix typo
PM / Hibernate: add section for resume options
doc: filesystems : Fix typo in Documentations/filesystems
scsi/megaraid fixed several typos in comments
ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
page_isolation: Fix a comment typo in test_pages_isolated()
doc: fix a typo about irq affinity
...
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -637,14 +637,13 @@ S: 14509 NE 39th Street #1096 S: Bellevue, Washington 98007 S: USA -N: Christopher L. Cheney -E: ccheney@debian.org -E: ccheney@cheney.cx -W: http://www.cheney.cx +N: Chris Cheney +E: chris.cheney@gmail.com +E: ccheney@redhat.com P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2 D: Vista Imaging usb webcam driver -S: 314 Prince of Wales -S: Conroe, TX 77304 +S: 2308 Therrell Way +S: McKinney, TX 75070 S: USA N: Stuart Cheshire |