]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pwm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 05:28:30 +0000 (16:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 05:28:30 +0000 (16:28 +1100)
commit91513fa01e9b1d46900f9af2e05f395f69e65001
treefb37f4ceffd4c3bb13e3b9d528801bb3618d031d
parent0ab9bc6e1ec3cea542959514c428998f37b1cfcc
parent8468949cddcdbb1b1b1bc552aefceb252078ceb1
Merge remote-tracking branch 'pwm/for-next'

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/mips/Kconfig