diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 05:38:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 05:38:27 +0100 |
| commit | 49dc2b7173010792c6923930ffcee84b7094b7de (patch) | |
| tree | 439899abc82e7413b3bee6d52823d5350d7f2245 /mm | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| parent | drivers/rtc: broken link fix (diff) | |
| download | linux-49dc2b7173010792c6923930ffcee84b7094b7de.tar.xz linux-49dc2b7173010792c6923930ffcee84b7094b7de.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
drivers/rtc: broken link fix
drm/i915 Fix typos in i915_gem_fence.c
Docs: fix missing word in REPORTING-BUGS
lib+mm: fix few spelling mistakes
MAINTAINERS: add git URL for APM driver
treewide: Fix typo in printk
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/balloon_compaction.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c index 300117f1a08f..57b3e9bd6bc5 100644 --- a/mm/balloon_compaction.c +++ b/mm/balloon_compaction.c @@ -13,10 +13,10 @@ /* * balloon_page_enqueue - allocates a new page and inserts it into the balloon * page list. - * @b_dev_info: balloon device decriptor where we will insert a new page to + * @b_dev_info: balloon device descriptor where we will insert a new page to * * Driver must call it to properly allocate a new enlisted balloon page - * before definetively removing it from the guest system. + * before definitively removing it from the guest system. * This function returns the page address for the recently enqueued page or * NULL in the case we fail to allocate a new page this turn. */ |