Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jul 2015 15:16:41 +0000 (08:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jul 2015 15:16:41 +0000 (08:16 -0700)
commit91cca0f0ffa3e485ad9d5b44744f23318c8f99ab
treece68f1f8dc0ccf73f82bb8111414ee08f86af852
parentec0337e089b21d1d81e23d31807a9b02df11daac
parentfb39f98d14d2c92531e79bcda5a0b802e2aaf202
Merge branch 'core-urgent-for-linus' of git://git./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
init/Kconfig