From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Jan 2015 00:25:42 +0000 (-0800)
Subject: Merge branch 'akpm' (patches from Andrew Morton)
X-Git-Tag: firefly_0821_release~176^2~2459
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4adca1cbc4cedb31aba03497b3de238ea13b566a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'akpm' (patches from Andrew Morton)

Merge misc fixes from Andrew Morton:
 "Six fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  drivers/rtc/rtc-s5m.c: terminate s5m_rtc_id array with empty element
  printk: add dummy routine for when CONFIG_PRINTK=n
  mm/vmscan: fix highidx argument type
  memcg: remove extra newlines from memcg oom kill log
  x86, build: replace Perl script with Shell script
  mm: page_alloc: embed OOM killing naturally into allocation slowpath
---

4adca1cbc4cedb31aba03497b3de238ea13b566a