please pull from the trivial tree
Subsystems (20)
Linus, please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial.git
This tree contains the following changes:
Adrian Bunk:
spelling: s/usefull/useful/ s/assoicated/associated/
spelling: s/retreive/retrieve/
spelling: s/trough/through/
MAINTAINERS: remove BUSLOGIC entry
remove the outdated arch/i386/kernel/cpu/{,mtrr/}changelog Documentation/filesystems/proc.txt: indentation fix
Jesper Juhl:
Small fixups to the EHCI Kconfig help text
Documentation/filesystems/proc.txt | 2 Documentation/i2o/ioctl | 2 Documentation/networking/sk98lin.txt | 2 Documentation/power/swsusp.txt | 4 MAINTAINERS | 7 Makefile | 2 arch/arm/mach-omap1/board-perseus2.c | 2 arch/i386/kernel/cpu/changelog | 63 ----- arch/i386/kernel/cpu/mtrr/changelog | 229 ------------------- arch/powerpc/kernel/prom.c | 2 arch/powerpc/kernel/rtas.c | 2 arch/powerpc/kernel/setup_64.c | 2 arch/powerpc/mm/hash_utils_64.c | 2 arch/powerpc/platforms/powermac/cpufreq_64.c | 2 arch/xtensa/kernel/time.c | 2 drivers/cdrom/cm206.c | 2 drivers/macintosh/therm_pm72.c | 4 drivers/macintosh/windfarm_pm81.c | 2 drivers/media/radio/radio-sf16fmr2.c | 2 drivers/message/i2o/README.ioctl | 2 drivers/net/hp100.c | 2 drivers/net/pcmcia/xirc2ps_cs.c | 2 drivers/net/sk98lin/skdim.c | 2 drivers/net/sk98lin/skge.c | 2 drivers/net/sk98lin/skgepnmi.c | 8 drivers/parisc/led.c | 2 drivers/usb/host/Kconfig | 10 drivers/usb/serial/cypress_m8.c | 2 drivers/usb/serial/usb-serial.c | 2 drivers/video/aty/radeon_monitor.c | 2 drivers/video/logo/Makefile | 2 drivers/w1/Kconfig | 2 fs/9p/vfs_inode.c | 2 include/asm-powerpc/smu.h | 6 include/linux/elevator.h | 2 net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 4 net/netfilter/nf_conntrack_proto_tcp.c | 4 scripts/Makefile.modpost | 2 scripts/mksysmap | 2 sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 2 40 files changed, 50 insertions(+), 349 deletions(-)
Documentation/filesystems/proc.txt +1 -1
@@ -418,7 +418,7 @@ VmallocChunk: 111088 kB Dirty: Memory which is waiting to get written back to the disk Writeback: Memory which is actively being written back to the disk Mapped: files which have been mmaped, such as libraries - Slab: in-kernel data structures cache + Slab: in-kernel data structures cache CommitLimit: Based on the overcommit ratio ('vm.overcommit_ratio'), this is the total amount of memory currently available to be allocated on the system. This limit is only adhered to
Documentation/i2o/ioctl +1 -1
@@ -185,7 +185,7 @@ VII. Getting Parameters ENOMEM Kernel memory allocation error A return value of 0 does not mean that the value was actually - properly retreived. The user should check the result list + properly retrieved. The user should check the result list to determine the specific status of the transaction. VIII. Downloading Software
Documentation/networking/sk98lin.txt +1 -1
@@ -245,7 +245,7 @@ Default: Both This parameters is only relevant if auto-negotiation for this port is not set to "Sense". If auto-negotiation is set to "On", all three values are possible. If it is set to "Off", only "Full" and "Half" are allowed. -This parameter is usefull if your link partner does not support all +This parameter is useful if your link partner does not support all possible combinations. Flow Control
Documentation/power/swsusp.txt +2 -2
@@ -212,7 +212,7 @@ A: Try running cat `cat /proc/[0-9]*/maps | grep / | sed 's:.* /:/:' | sort -u` > /dev/null -after resume. swapoff -a; swapon -a may also be usefull. +after resume. swapoff -a; swapon -a may also be useful. Q: What happens to devices during swsusp? They seem to be resumed during system suspend?
@@ -323,7 +323,7 @@ to be useless to try to suspend to disk A: No, it should work okay, as long as your app does not mlock() it. Just prepare big enough swap partition. -Q: What information is usefull for debugging suspend-to-disk problems? +Q: What information is useful for debugging suspend-to-disk problems? A: Well, last messages on the screen are always useful. If something is broken, it is usually some kernel driver, therefore trying with as
MAINTAINERS +0 -7
@@ -546,13 +546,6 @@ W: http://linuxtv.org T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git S: Maintained -BUSLOGIC SCSI DRIVER -P: Leonard N. Zubkoff -M: Leonard N. Zubkoff <[email protected]> -L: [email protected] -W: http://www.dandelion.com/Linux/ -S: Maintained - COMMON INTERNET FILE SYSTEM (CIFS) P: Steve French M: [email protected]
Makefile +1 -1
@@ -251,7 +251,7 @@ export KBUILD_CHECKSRC KBUILD_SRC KBUILD # If it is set to "silent_", nothing wil be printed at all, since # the variable $(silent_cmd_cc_o_c) doesn't exist. # -# A simple variant is to prefix commands with $(Q) - that's usefull +# A simple variant is to prefix commands with $(Q) - that's useful # for commands that shall be hidden in non-verbose mode. # # $(Q)ln $@ :<
arch/arm/mach-omap1/board-perseus2.c +1 -1
@@ -184,7 +184,7 @@ static void __init omap_perseus2_map_io(omap_writel (0x00000088 ,OMAP730_FLASH_ACFG_0 );/* -* Ethernet support trough the debug board +* Ethernet support through the debug board * CS1 timings setup */ omap_writel (0x0000fff3 ,OMAP730_FLASH_CFG_1 );
arch/i386/kernel/cpu/changelog deleted +0 -63
63 lines not on this page · raw message
arch/i386/kernel/cpu/mtrr/changelog deleted +0 -229
229 lines not on this page · raw message
arch/powerpc/kernel/prom.c +1 -1
@@ -972,7 +972,7 @@ static int __init early_init_dt_scan_cho#endif #ifdef CONFIG_PPC_RTAS -/* To help early debugging via the front panel, we retreive a minimal +/* To help early debugging via the front panel, we retrieve a minimal * set of RTAS infos now if available */ {
arch/powerpc/kernel/rtas.c +1 -1
@@ -632,7 +632,7 @@ void rtas_stop_self(void) }/* -* Call early during boot, before mem init or bootmem, to retreive the RTAS +* Call early during boot, before mem init or bootmem, to retrieve the RTAS * informations from the device-tree and allocate the RMO buffer for userland * accesses. */
arch/powerpc/kernel/setup_64.c +1 -1
@@ -438,7 +438,7 @@ void __init setup_system(void)/* * Fill the ppc64_caches & systemcfg structures with informations -* retreived from the device-tree. Need to be called before +* retrieved from the device-tree. Need to be called before * finish_device_tree() since the later requires some of the * informations filled up here to properly parse the interrupt * tree.
arch/powerpc/mm/hash_utils_64.c +1 -1
@@ -368,7 +368,7 @@ static unsigned long __init htab_get_tabunsigned long mem_size, rnd_mem_size, pteg_count;/* If hash size isn't already provided by the platform, we try to -* retreive it from the device-tree. If it's not there neither, we +* retrieve it from the device-tree. If it's not there neither, we * calculate it now based on the total RAM size */ if (ppc64_pft_size ==0 )
arch/powerpc/platforms/powermac/cpufreq_64.c +1 -1
@@ -80,7 +80,7 @@ static struct freq_attr* g5_cpu_freqs_at };/* Power mode data is an array of the 32 bits PCR values to use for -* the various frequencies, retreived from the device-tree +* the various frequencies, retrieved from the device-tree */ static u32 *g5_pmode_data;static int g5_pmode_max;
arch/xtensa/kernel/time.c +1 -1
@@ -201,7 +201,7 @@ again:if ((signed long )(get_ccount () - next) >0 ) goto again; -/* Allow platform to do something usefull (Wdog). */ +/* Allow platform to do something useful (Wdog). */ platform_heartbeat ();
drivers/cdrom/cm206.c +1 -1
@@ -32,7 +32,7 @@ History: 18 mrt 1995: 0.24 Working background read-ahead. (still problems) 26 mrt 1995: 0.25 Multi-session ioctl added (kernel v1.2). Statistics implemented, though separate stats206.h. - Accessible trough ioctl 0x1000 (just a number). + Accessible through ioctl 0x1000 (just a number). Hard to choose between v1.2 development and 1.1.75. Bottom-half doesn't work with 1.2... 0.25a: fixed... typo. Still problems...
drivers/macintosh/therm_pm72.c +2 -2
@@ -630,12 +630,12 @@ static int read_eeprom(int cpu, struct msprintf (nodename,"/u3@0,f8000000/i2c@f8001000/cpuid@a%d" , cpu ?2 :0 ); np =of_find_node_by_path (nodename);if (np ==NULL ) { -printk (KERN_ERR "therm_pm72: Failed to retreive cpuid node from device-tree\n" ); +printk (KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n" );return -ENODEV ; } data = (u8 *)get_property (np,"cpuid" , &len);if (data ==NULL ) { -printk (KERN_ERR "therm_pm72: Failed to retreive cpuid property from device-tree\n" ); +printk (KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n" );of_node_put (np);return -ENODEV ; }
drivers/macintosh/windfarm_pm81.c +1 -1
@@ -26,7 +26,7 @@* (typically the drive fan) * - the main control (first control) gets the target value scaled with * the first pair of factors, and is then modified as below -* - the value of the target of the CPU Fan control loop is retreived, +* - the value of the target of the CPU Fan control loop is retrieved, * scaled with the second pair of factors, and the max of that and * the scaled target is applied to the main control. *
drivers/media/radio/radio-sf16fmr2.c +1 -1
@@ -48,7 +48,7 @@ static int io = 0x384;static int radio_nr =-1 ;/* hw precision is 12.5 kHz -* It is only usefull to give freq in intervall of 200 (=0.0125Mhz), +* It is only useful to give freq in intervall of 200 (=0.0125Mhz), * other bits will be truncated */ #define RSF16_ENCODE (x) ((x)/200+856)
drivers/message/i2o/README.ioctl +1 -1
@@ -185,7 +185,7 @@ VII. Getting Parameters ENOMEM Kernel memory allocation error A return value of 0 does not mean that the value was actually - properly retreived. The user should check the result list + properly retrieved. The user should check the result list to determine the specific status of the transaction. VIII. Downloading Software
drivers/net/hp100.c +1 -1
@@ -276,7 +276,7 @@ static void hp100_RegisterDump(struct ne* Convert an address in a kernel buffer to a bus/phys/dma address. * This work *only* for memory fragments part of lp->page_vaddr, * because it was properly DMA allocated via pci_alloc_consistent(), -* so we just need to "retreive" the original mapping to bus/phys/dma +* so we just need to "retrieve" the original mapping to bus/phys/dma * address - Jean II */ static inline dma_addr_t virt_to_whatever (struct net_device *dev,u32 * ptr) {
drivers/net/pcmcia/xirc2ps_cs.c +1 -1
@@ -1598,7 +1598,7 @@ do_ioctl(struct net_device *dev, structswitch (cmd) {case SIOCGMIIPHY :/* Get the address of the PHY in use. */ data[0 ] =0 ;/* we have only this address */ -/* fall trough */ +/* fall through */ case SIOCGMIIREG :/* Read the specified MII register. */ data[3 ] =mii_rd (ioaddr, data[0 ] &0x1f , data[1 ] &0x1f );break ;
drivers/net/sk98lin/skdim.c +1 -1
@@ -180,7 +180,7 @@ SkDimModerate(SK_AC *pAC) {/* ** The number of interrupts per sec is the same as expected. ** Evalulate the descriptor-ratio. If it has changed, a resize -** in the moderation timer might be usefull +** in the moderation timer might be useful */ if (M_DIMINFO .AutoSizing) {ResizeDimTimerDuration (pAC);
drivers/net/sk98lin/skge.c +1 -1
@@ -2851,7 +2851,7 @@ unsigned long Flags; /* for spin lock* Description: * This function is called if an ioctl is issued on the device. * There are three subfunction for reading, writing and test-writing -* the private MIB data structure (usefull for SysKonnect-internal tools). +* the private MIB data structure (useful for SysKonnect-internal tools). * * Returns: * 0, if everything is ok
drivers/net/sk98lin/skgepnmi.c +4 -4
@@ -611,7 +611,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in* Description: * Calls a general sub-function for all this stuff. The preset does * the same as a set, but returns just before finally setting the -* new value. This is usefull to check if a set might be successfull. +* new value. This is useful to check if a set might be successfull. * If the instance -1 is passed, an array of values is supposed and * all instances of the OID will be set. *
@@ -654,7 +654,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in* Description: * Calls a general sub-function for all this stuff. The preset does * the same as a set, but returns just before finally setting the -* new value. This is usefull to check if a set might be successfull. +* new value. This is useful to check if a set might be successfull. * If the instance -1 is passed, an array of values is supposed and * all instances of the OID will be set. *
@@ -870,7 +870,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in* Description: * Calls a general sub-function for all this set stuff. The preset does * the same as a set, but returns just before finally setting the -* new value. This is usefull to check if a set might be successfull. +* new value. This is useful to check if a set might be successfull. * The sub-function runs through the IdTable, checks which OIDs are able * to set, and calls the handler function of the OID to perform the * preset. The return value of the function will also be stored in
@@ -6473,7 +6473,7 @@ unsigned int PhysPortIndex) /* Physical* * Description: * The COMMON module only tells us if the mode is half or full duplex. -* But in the decade of auto sensing it is usefull for the user to +* But in the decade of auto sensing it is useful for the user to * know if the mode was negotiated or forced. Therefore we have a * look to the mode, which was last used by the negotiation process. *
drivers/parisc/led.c +1 -1
@@ -347,7 +347,7 @@ static void led_LCD_driver(unsigned char** ** led_get_net_activity() ** -** calculate if there was TX- or RX-troughput on the network interfaces +** calculate if there was TX- or RX-throughput on the network interfaces ** (analog to dev_get_info() from net/core/dev.c) ** */
drivers/usb/host/Kconfig +5 -5
@@ -11,14 +11,14 @@ config USB_EHCI_HCD The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware. If your USB host controller supports USB 2.0, you will likely want to - configure this Host Controller Driver. At this writing, the primary - implementation of EHCI is a chip from NEC, widely available in add-on - PCI cards, but implementations are in the works from other vendors - including Intel and Philips. Motherboard support is appearing. + configure this Host Controller Driver. At the time of this writing, + the primary implementation of EHCI is a chip from NEC, widely available + in add-on PCI cards, but implementations are in the works from other + vendors including Intel and Philips. Motherboard support is appearing. EHCI controllers are packaged with "companion" host controllers (OHCI or UHCI) to handle USB 1.1 devices connected to root hub ports. Ports - will connect to EHCI if it the device is high speed, otherwise they + will connect to EHCI if the device is high speed, otherwise they connect to a companion controller. If you configure EHCI, you should probably configure the OHCI (for NEC and some other vendors) USB Host Controller Driver or UHCI (for Via motherboards) Host Controller
drivers/usb/serial/cypress_m8.c +1 -1
@@ -357,7 +357,7 @@ static int cypress_serial_control (struc }while (retval !=5 && retval !=ENODEV );if (retval !=5 ) { -err ("%s - failed to retreive serial line settings - %d" , __FUNCTION__, retval); +err ("%s - failed to retrieve serial line settings - %d" , __FUNCTION__, retval);return retval; }else {spin_lock_irqsave (&priv->lock, flags);
drivers/usb/serial/usb-serial.c +1 -1
@@ -584,7 +584,7 @@ static struct usb_serial_driver *search_const struct usb_device_id *id;struct usb_serial_driver *t; -/* List trough know devices and see if the usb id matches */ +/* Check if the usb id matches a known device */ list_for_each (p, &usb_serial_driver_list) { t = list_entry(p, struct usb_serial_driver, driver_list); id =usb_match_id (iface, t->id_table);
drivers/video/aty/radeon_monitor.c +1 -1
@@ -423,7 +423,7 @@ static int __devinit radeon_parse_monito/* * Probe display on both primary and secondary card's connector (if any) * by various available techniques (i2c, OF device tree, BIOS, ...) and -* try to retreive EDID. The algorithm here comes from XFree's radeon +* try to retrieve EDID. The algorithm here comes from XFree's radeon * driver */ void __devinit radeon_probe_screens(struct radeonfb_info *rinfo,
drivers/video/logo/Makefile +1 -1
@@ -16,7 +16,7 @@ obj-$(CONFIG_LOGO_M32R_CLUT224) += logo # How to generate logo's -# Use logo-cfiles to retreive list of .c files to be built +# Use logo-cfiles to retrieve list of .c files to be built logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \ $(wildcard $(srctree)/$(src)/*$(1).$(2))))
drivers/w1/Kconfig +1 -1
@@ -3,7 +3,7 @@ menu "Dallas's 1-wire bus" config W1 tristate "Dallas's 1-wire support" ---help--- - Dallas's 1-wire bus is usefull to connect slow 1-pin devices + Dallas's 1-wire bus is useful to connect slow 1-pin devices such as iButtons and thermal sensors. If you want W1 support, you should say Y here.
fs/9p/vfs_inode.c +1 -1
@@ -663,7 +663,7 @@ v9fs_vfs_rename(struct inode *old_dir, s }/** -* v9fs_vfs_getattr - retreive file metadata +* v9fs_vfs_getattr - retrieve file metadata * @mnt - mount information * @dentry - file to get attributes on * @stat - metadata structure to populate
include/asm-powerpc/smu.h +3 -3
@@ -22,7 +22,7 @@/* * Partition info commands * -* These commands are used to retreive the sdb-partition-XX datas from +* These commands are used to retrieve the sdb-partition-XX datas from * the SMU. The lenght is always 2. First byte is the subcommand code * and second byte is the partition ID. *
@@ -225,7 +225,7 @@* * SMU_CMD_MISC_ee_GET_DATABLOCK_REC is used, among others, to * transfer blocks of data from the SMU. So far, I've decrypted it's -* usage to retreive partition data. In order to do that, you have to +* usage to retrieve partition data. In order to do that, you have to * break your transfer in "chunks" since that command cannot transfer * more than a chunk at a time. The chunk size used by OF is 0xe bytes, * but it seems that the darwin driver will let you do 0x1e bytes if
@@ -556,7 +556,7 @@ struct smu_user_cmd_hdr__u32 cmdtype;#define SMU_CMDTYPE_SMU 0/* SMU command */ #define SMU_CMDTYPE_WANTS_EVENTS 1/* switch fd to events mode */ -#define SMU_CMDTYPE_GET_PARTITION 2/* retreive an sdb partition */ +#define SMU_CMDTYPE_GET_PARTITION 2/* retrieve an sdb partition */ __u8 cmd;/* SMU command byte */ __u8 pad[3 ];/* padding */
include/linux/elevator.h +1 -1
@@ -66,7 +66,7 @@ struct elevator_type };/* -* each queue has an elevator_queue assoicated with it +* each queue has an elevator_queue associated with it */ struct elevator_queue {
net/ipv4/netfilter/ip_conntrack_proto_tcp.c +2 -2
@@ -995,7 +995,7 @@ static int tcp_packet(struct ip_conntrac || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) && conntrack->proto.tcp.last_index == TCP_ACK_SET)) && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { -/* RST sent to invalid SYN or ACK we had let trough +/* RST sent to invalid SYN or ACK we had let through * at a) and c) above: * * a) SYN was in window then
@@ -1006,7 +1006,7 @@ static int tcp_packet(struct ip_conntrac* segments we ignored. */ goto in_window; } -/* Just fall trough */ +/* Just fall through */ default :/* Keep compilers happy. */ break ;
net/netfilter/nf_conntrack_proto_tcp.c +2 -2
@@ -988,7 +988,7 @@ static int tcp_packet(struct nf_conn *co || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) && conntrack->proto.tcp.last_index == TCP_ACK_SET)) && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { -/* RST sent to invalid SYN or ACK we had let trough +/* RST sent to invalid SYN or ACK we had let through * at a) and c) above: * * a) SYN was in window then
@@ -999,7 +999,7 @@ static int tcp_packet(struct nf_conn *co* segments we ignored. */ goto in_window; } -/* Just fall trough */ +/* Just fall through */ default :/* Keep compilers happy. */ break ;
scripts/Makefile.modpost +1 -1
@@ -30,7 +30,7 @@ # - See include/linux/module.h for more details # Step 4 is solely used to allow module versioning in external modules, -# where the CRC of each module is retreived from the Module.symers file. +# where the CRC of each module is retrieved from the Module.symers file. .PHONY: _modpost _modpost: __modpost
scripts/mksysmap +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh -x # Based on the vmlinux file create the System.map file # System.map is used by module-init tools and some debugging -# tools to retreive the actual addresses of symbols in the kernel. +# tools to retrieve the actual addresses of symbols in the kernel. # # Usage # mksysmap vmlinux System.map
sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c +1 -1
@@ -209,7 +209,7 @@ static int pdacf_pcm_prepare(struct snd_case SNDRV_PCM_FORMAT_S24_3LE :case SNDRV_PCM_FORMAT_S24_3BE : chip->pcm_sample =3 ; -/* fall trough */ +/* fall through */ default :/* 24-bit */ aval =AK4117_DIF_24R ; chip->pcm_frame =3 ;