]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.8/soc' into for-next
authorStephen Warren <swarren@wwwdotorg.org>
Sun, 28 Oct 2012 02:29:36 +0000 (20:29 -0600)
committerStephen Warren <swarren@wwwdotorg.org>
Sun, 28 Oct 2012 02:29:36 +0000 (20:29 -0600)
1  2 
arch/arm/mach-bcm2835/bcm2835.c

Simple merge