diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-26 16:25:42 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-26 16:25:42 -0800 |
commit | 4adca1cbc4cedb31aba03497b3de238ea13b566a (patch) | |
tree | 7f5e26da972eb9a5653f9c87cb9db471200702bf /drivers/scsi | |
parent | c976a67b02821d324f5e9fffe87e807364fe1a0e (diff) | |
parent | 45cd15e600ec8006305ce83f62c7208c2cb7a052 (diff) | |
download | linux-4adca1cbc4cedb31aba03497b3de238ea13b566a.tar.gz linux-4adca1cbc4cedb31aba03497b3de238ea13b566a.tar.bz2 linux-4adca1cbc4cedb31aba03497b3de238ea13b566a.zip |
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
Diffstat (limited to 'drivers/scsi')
0 files changed, 0 insertions, 0 deletions