]> git.karo-electronics.de Git - karo-tx-linux.git/commit - scripts/coccinelle/null/badzero.cocci
Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Mon, 30 Apr 2012 17:08:29 +0000 (10:08 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 30 Apr 2012 17:08:29 +0000 (10:08 -0700)
commita8822e2d570bc265c9fa0347710fbcc7bef8b327
tree4a5b198d5ab6bdde620f9dbe8282a10604a204a4
parent69964ea4c7b68c9399f7977aa5b9aa6539a6a98a
parent39358f2b57f37fe079eff4159307c844a0bfb176
Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into pm-regulator

Conflicts:
arch/arm/mach-omap2/twl-common.c
arch/arm/mach-omap2/twl-common.c