]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sound-asoc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 02:28:40 +0000 (13:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 02:28:40 +0000 (13:28 +1100)
1  2 
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-seaboard.c

Simple merge
Simple merge