From 91fe4d508f29d71133e9a82ebdc1f2274c514b70 Mon Sep 17 00:00:00 2001 From: Thomas Weber Date: Fri, 17 Feb 2012 17:46:21 +0100 Subject: Fix typo milivolt => millivolt Signed-off-by: Thomas Weber Signed-off-by: Jiri Kosina --- include/linux/mfd/wm831x/pdata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h index 1d7a3f7b3b5d..dcc9631b3052 100644 --- a/include/linux/mfd/wm831x/pdata.h +++ b/include/linux/mfd/wm831x/pdata.h @@ -26,7 +26,7 @@ struct wm831x_backlight_pdata { struct wm831x_backup_pdata { int charger_enable; int no_constant_voltage; /** Disable constant voltage charging */ - int vlim; /** Voltage limit in milivolts */ + int vlim; /** Voltage limit in millivolts */ int ilim; /** Current limit in microamps */ }; -- cgit v1.2.3 From b3aa1584e9f3449b0669ab2beb9b9bf99874e1d6 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Mon, 9 Apr 2012 10:44:57 -0700 Subject: workqueue: Fix workqueue_execute_end() comment workqueue_execute_end() is called after the callback function, not before. Signed-off-by: Stephen Boyd Acked-by: Tejun Heo Signed-off-by: Jiri Kosina --- include/trace/events/workqueue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h index 7d497291c85d..4018f5058f27 100644 --- a/include/trace/events/workqueue.h +++ b/include/trace/events/workqueue.h @@ -103,7 +103,7 @@ TRACE_EVENT(workqueue_execute_start, ); /** - * workqueue_execute_end - called immediately before the workqueue callback + * workqueue_execute_end - called immediately after the workqueue callback * @work: pointer to struct work_struct * * Allows to track workqueue execution. -- cgit v1.2.3 From 35fca53e15a696adbea300a981df4bbfb09a76d6 Mon Sep 17 00:00:00 2001 From: Wang YanQing Date: Sun, 15 Apr 2012 20:42:28 +0800 Subject: mmzone: fix comment typo coelesce -> coalesce Signed-off-by: Wang YanQing Signed-off-by: Jiri Kosina --- include/linux/mmzone.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index dff711509661..41aa49b74821 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -30,7 +30,7 @@ /* * PAGE_ALLOC_COSTLY_ORDER is the order at which allocations are deemed * costly to service. That is between allocation orders which should - * coelesce naturally under reasonable reclaim pressure and those which + * coalesce naturally under reasonable reclaim pressure and those which * will not. */ #define PAGE_ALLOC_COSTLY_ORDER 3 -- cgit v1.2.3 From c0a788c451e1f88b3fb5a85113b87dbc98c7abe4 Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Mon, 7 May 2012 15:33:04 -0400 Subject: net: Fix tcp_build_and_update_options comment in struct tcp_sock Noticed this comment didn't get updated when tcp_build_and_update_options was refactored. Signed-off-by: Kyle McMartin Signed-off-by: Jiri Kosina --- include/linux/tcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/tcp.h b/include/linux/tcp.h index b6c62d294380..288d201c3b59 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -406,7 +406,7 @@ struct tcp_sock { struct sk_buff_head out_of_order_queue; /* Out of order segments go here */ - /* SACKs data, these 2 need to be together (see tcp_build_and_update_options) */ + /* SACKs data, these 2 need to be together (see tcp_options_write) */ struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */ struct tcp_sack_block selective_acks[4]; /* The SACKS themselves*/ -- cgit v1.2.3 From 6684b5729df289ba60a404d8d095d820dc553cdf Mon Sep 17 00:00:00 2001 From: Oskar Schirmer Date: Wed, 16 May 2012 09:41:19 +0000 Subject: lib: Change mail address of Oskar Schirmer That old mail address doesnt exist any more. This changes all occurences to my new address. Signed-off-by: Oskar Schirmer Cc: Paul Gortmaker Signed-off-by: Jiri Kosina --- include/linux/rational.h | 2 +- lib/rational.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/linux/rational.h b/include/linux/rational.h index 4f532fcd9eea..bfa6a2bcfb32 100644 --- a/include/linux/rational.h +++ b/include/linux/rational.h @@ -1,7 +1,7 @@ /* * rational fractions * - * Copyright (C) 2009 emlix GmbH, Oskar Schirmer + * Copyright (C) 2009 emlix GmbH, Oskar Schirmer * * helper functions when coping with rational numbers, * e.g. when calculating optimum numerator/denominator pairs for diff --git a/lib/rational.c b/lib/rational.c index d326da3976f5..f0aa21c2a762 100644 --- a/lib/rational.c +++ b/lib/rational.c @@ -1,7 +1,7 @@ /* * rational fractions * - * Copyright (C) 2009 emlix GmbH, Oskar Schirmer + * Copyright (C) 2009 emlix GmbH, Oskar Schirmer * * helper functions when coping with rational numbers */ -- cgit v1.2.3