diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-12 02:22:25 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-12 02:22:25 -0400 |
| commit | f46e374c1ea7fafce70a838f09fbd67de3e4d49f (patch) | |
| tree | e191e5316bdb8558bd3e2b0981c715bedd225ca7 /mm/page-writeback.c | |
| parent | a4d3621e0d3ecf191961dc9214e4a378a7186780 (diff) | |
| parent | eb8ca943bae2b84c3fc14dfd7a908cb334465fef (diff) | |
Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: marzen: enable thermal sensor
ARM: shmobile: marzen: fixup regulator id for smsc911x
ARM: shmobile: marzen: add SDHI0 support
+ sync to 3.6-rc4
Diffstat (limited to 'mm/page-writeback.c')
| -rw-r--r-- | mm/page-writeback.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index e5363f34e025..5ad5ce23c1e0 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
| @@ -1532,7 +1532,6 @@ int dirty_writeback_centisecs_handler(ctl_table *table, int write, | |||
| 1532 | void __user *buffer, size_t *length, loff_t *ppos) | 1532 | void __user *buffer, size_t *length, loff_t *ppos) |
| 1533 | { | 1533 | { |
| 1534 | proc_dointvec(table, write, buffer, length, ppos); | 1534 | proc_dointvec(table, write, buffer, length, ppos); |
| 1535 | bdi_arm_supers_timer(); | ||
| 1536 | return 0; | 1535 | return 0; |
| 1537 | } | 1536 | } |
| 1538 | 1537 | ||