tree ce68f1f8dc0ccf73f82bb8111414ee08f86af852
parent ec0337e089b21d1d81e23d31807a9b02df11daac
parent fb39f98d14d2c92531e79bcda5a0b802e2aaf202
author Linus Torvalds <torvalds@linux-foundation.org> 1436023001 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1436023001 -0700

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull max log buf size increase from Ingo Molnar:
 "Ran into this limit recently, so increase it by an order of magnitude"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  printk: Increase maximum CONFIG_LOG_BUF_SHIFT from 21 to 25