]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitaba8ad221c2c5477d8dc688ad25959d5c66053e1
treebf1e775785370a7b2fe0844b7725f47e4c66335c
parentad4a839dd538266a5f501a23eeb49c889b0745ae
parent8ecd10d9a8aefdee18c8664c92cb7001c73b4ac3
Merge branch 'merge' of git://git.kernel.org/pub/scm/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