From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Aug 2011 15:58:36 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: firefly_0821_release~3680^2~4534
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e9208a4eec8acbde7ede6516c39dea05f3b700dc;p=firefly-linux-kernel-4.4.55.git

Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/p1023rds: Fix the error of bank-width of nor flash
  powerpc/85xx: enable caam crypto driver by default
  powerpc/85xx: enable the audio drivers in the defconfigs
---

e9208a4eec8acbde7ede6516c39dea05f3b700dc