]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 03:49:48 +0000 (13:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 03:49:48 +0000 (13:49 +1000)
Conflicts:
drivers/rtc/rtc-twl.c

1  2 
arch/arm/mach-omap2/board-omap3beagle.c