]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'gen-gpio/for_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:41:28 +0000 (15:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:41:28 +0000 (15:41 +1100)
commit7abc076f76a3d279c21ecca86d05e85bcaa3144b
tree3c1aaa90e54c3ba5709105797c23d00bfa34874e
parent601179be8670b4d2931dedddbde239d06ed460dd
parent994817c0f84f72d8fa8aeee11eecaf326912d43f
Merge remote-tracking branch 'gen-gpio/for_next'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
arch/blackfin/Kconfig
arch/mips/Kconfig
arch/powerpc/platforms/85xx/Kconfig
arch/powerpc/platforms/Kconfig
arch/sh/kernel/cpu/sh2a/Makefile