]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83cea47 ab872c8)
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2011 04:04:06 +0000 (15:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2011 04:04:06 +0000 (15:04 +1100)
Conflicts:
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/core.c


Trivial merge
Linux kernel for KaRo TX COM modules