From: Linus Torvalds Date: Thu, 29 Jun 2006 18:30:45 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 X-Git-Tag: daily-2014.03.25.0_l4t/l4t-r19.1~45323 X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=commitdiff_plain;h=4d3ce21fa9d2eaeda113aa2f9c2da80d972bef64;hp=-c Merge /pub/scm/linux/kernel/git/kyle/parisc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (23 commits) [PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__ [PARISC] Fix do_gettimeofday() hang [PARISC] Fix PCREL22F relocation problem for most modules [PARISC] Refactor show_regs in traps.c [PARISC] Add os_id_to_string helper [PARISC] OS_ID_LINUX == 0x0006 [PARISC] Ensure Space ID hashing is turned off [PARISC] Match show_cache_info with reality [PARISC] Remove unused macro fixup_branch in syscall.S [PARISC] Add is_compat_task() helper [PARISC] Update Thibaut Varene's CREDITS entry [PARISC] Reduce data footprint in pdc_stable.c [PARISC] pdc_stable version 0.30 [PARISC] Work around machines which do not support chassis warnings [PARISC] PDC_CHASSIS is implemented on all machines [PARISC] Remove unconditional #define PIC in syscall macros [PARISC] Use MFIA in current_text_addr on pa2.0 processors [PARISC] Remove dead function pc_in_user_space [PARISC] Test ioc_needs_fdc variable instead of open coding [PARISC] Fix gcc 4.1 warnings in sba_iommu.c ... --- 4d3ce21fa9d2eaeda113aa2f9c2da80d972bef64 diff --combined CREDITS index 85c7c70b704,70922bd656c..66b9e7a9abf --- a/CREDITS +++ b/CREDITS @@@ -24,11 -24,6 +24,11 @@@ S: C. Negri 6, bl. D S: Iasi 6600 S: Romania +N: Mark Adler +E: madler@alumni.caltech.edu +W: http://alumnus.caltech.edu/~madler/ +D: zlib decompression + N: Monalisa Agrawal E: magrawal@nortelnetworks.com D: Basic Interphase 5575 driver with UBR and ABR support. @@@ -3401,10 -3396,10 +3401,10 @@@ S: Czech Republi N: Thibaut Varene E: T-Bone@parisc-linux.org - W: http://www.parisc-linux.org/ + W: http://www.parisc-linux.org/~varenet/ P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063 D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits - D: Some bits in an ARM port, S1D13XXX FB driver, random patches here and there + D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there D: AD1889 sound driver S: Paris, France