diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-17 12:52:14 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-17 12:52:14 +1100 |
| commit | 95faeddb5b78f30a0f4621dfa4b78b57072e93b0 (patch) | |
| tree | 7dec4e22f5a1e13d6342b48fc6437930e3f928f1 /block/cfq-iosched.c | |
| parent | ffaec709146ee58632ac47b536b654bcfaaf3a92 (diff) | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
Merge remote branch 'trivial/for-next'
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 9b186fd6bf47..a1cfaacc970f 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1018,7 +1018,7 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create) /* * Add group onto cgroup list. It might happen that bdi->dev is - * not initiliazed yet. Initialize this new group without major + * not initialized yet. Initialize this new group without major * and minor info and this info will be filled in once a new thread * comes for IO. See code above. */ |