]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 04:22:04 +0000 (14:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 04:22:04 +0000 (14:22 +1000)
commit86fe492d6b4f4890708dcdcb9f1a3de8ee5d2aab
treeeaf171667c1d57daa38309c28317f4576c5f52d3
parent2e4dcd078c162ad8851b1b93c6a6257fad34db55
parent0d011ae79144938f8ff62fc9f2c718c0cd348b50
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
drivers/rtc/rtc-twl.c
arch/arm/mach-omap2/board-omap3beagle.c