Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 201126
b: refs/heads/master
c: a4ce96a
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Jul 21, 2010
1 parent e3a5fa7 commit 75e5918
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96
refs/heads/master: a4ce96ac356e7024a7724ade9d18ba1bdf3c5c06
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/setup_percpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void __init setup_per_cpu_areas(void)
per_cpu(x86_cpu_to_node_map, cpu) =
early_per_cpu_map(x86_cpu_to_node_map, cpu);
/*
* Ensure taht the boot cpu numa_node is correct when the boot
* Ensure that the boot cpu numa_node is correct when the boot
* cpu is on a node that doesn't have memory installed.
* Also cpu_up() will call cpu_to_node() for APs when
* MEMORY_HOTPLUG is defined, before per_cpu(numa_node) is set
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/f_fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ struct ffs_data {
* handling setup requests immidiatelly user space may be so
* slow that another setup will be sent to the gadget but this
* time not to us but another function and then there could be
* a race. Is taht the case? Or maybe we can use cdev->req
* a race. Is that the case? Or maybe we can use cdev->req
* after all, maybe we just need some spinlock for that? */
struct usb_request *ep0req; /* P: mutex */
struct completion ep0req_completion; /* P: mutex */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/video/aty/radeon_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -2872,7 +2872,7 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis
}

#if 0
/* Power down TV DAC, taht saves a significant amount of power,
/* Power down TV DAC, that saves a significant amount of power,
* we'll have something better once we actually have some TVOut
* support
*/
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/jffs2/xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ void jffs2_xattr_free_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *i

static int check_xattr_ref_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic)
{
/* success of check_xattr_ref_inode() means taht inode (ic) dose not have
/* success of check_xattr_ref_inode() means that inode (ic) dose not have
* duplicate name/value pairs. If duplicate name/value pair would be found,
* one will be removed.
*/
Expand Down

0 comments on commit 75e5918

Please sign in to comment.