]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 02:27:33 +0000 (12:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 02:27:33 +0000 (12:27 +1000)
commite175a374ff6f79a07dc4fd7f234ce44de82369bd
tree33589c4b9165e119c2b11005dbd5400f8365bc4c
parenteb2659d7ddcfbd23e3286b292532e86d2c5e537f
parentcfdf9bfc2e87f57a217b681ffc874730557e3935
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/mips/loongson/lemote-2f/clock.c
MAINTAINERS
arch/mips/loongson/lemote-2f/clock.c