Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Aug 2011 15:58:36 +0000 (08:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Aug 2011 15:58:36 +0000 (08:58 -0700)
commite9208a4eec8acbde7ede6516c39dea05f3b700dc
treebf1e775785370a7b2fe0844b7725f47e4c66335c
parent9e79e3e9dd9672b37ac9412e9a926714306551fe
parent0c81e4b426a17785ebd4f41d1e14a818706bdc90
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