Merge branch 'linus'
commit431e0642b9e2146471b9240add120b0b0ea7616f
authorIngo Molnar <mingo@elte.hu>
Wed, 10 Aug 2011 13:12:27 +0000 (10 15:12 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 10 Aug 2011 13:12:27 +0000 (10 15:12 +0200)
tree1c021e78d5717f1f33c47046873b945120997ae9
parentc9dc255b0b44850d23469634a4d7caab18c3dca2
parentf2c0d0266cc5eb36a4aa44944b4096ec121490aa
Merge branch 'linus'
sound/soc/codecs/Kconfig