diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 16:36:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 16:36:46 -0700 |
| commit | e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b (patch) | |
| tree | c676609730533fc1b7c5e01992e46b6eaf75f99b /mm/pdflush.c | |
| parent | 548453fd107f789f5f1bc2dc13cc432ceb3b5efd (diff) | |
| parent | 838cb6aba4cebcf4fcd06b90e2adf890bef884ac (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
DOC: A couple corrections and clarifications in USB doc.
Generate a slightly more informative error msg for bad HZ
fix typo "is" -> "if" in Makefile
ext*: spelling fix prefered -> preferred
DOCUMENTATION: Use newer DEFINE_SPINLOCK macro in docs.
KEYS: Fix the comment to match the file name in rxrpc-type.h.
RAID: remove trailing space from printk line
DMA engine: typo fixes
Remove unused MAX_NODES_SHIFT
MAINTAINERS: Clarify access to OCFS2 development mailing list.
V4L: Storage class should be before const qualifier (sn9c102)
V4L: Storage class should be before const qualifier
sonypi: Storage class should be before const qualifier
intel_menlow: Storage class should be before const qualifier
DVB: Storage class should be before const qualifier
arm: Storage class should be before const qualifier
ALSA: Storage class should be before const qualifier
acpi: Storage class should be before const qualifier
firmware_sample_driver.c: fix coding style
MAINTAINERS: Add ati_remote2 driver
...
Fixed up trivial conflicts in firmware_sample_driver.c
Diffstat (limited to 'mm/pdflush.c')
| -rw-r--r-- | mm/pdflush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/pdflush.c b/mm/pdflush.c index 0ceacff56457..1c96cfc9e040 100644 --- a/mm/pdflush.c +++ b/mm/pdflush.c @@ -17,8 +17,8 @@ #include <linux/gfp.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/fs.h> // Needed by writeback.h -#include <linux/writeback.h> // Prototypes pdflush_operation() +#include <linux/fs.h> /* Needed by writeback.h */ +#include <linux/writeback.h> /* Prototypes pdflush_operation() */ #include <linux/kthread.h> #include <linux/cpuset.h> #include <linux/freezer.h> |