]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:15:24 +0000 (14:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:15:24 +0000 (14:15 +1000)
commit61f651d58142cb88c4d0c52438f04d41a3a6f12b
tree2fe5aad1bd0e670742e151ada0931155c7c7ee1d
parentda1e8bb4c877648b6b09c1f70a2af29aa9946e1c
parent0d011ae79144938f8ff62fc9f2c718c0cd348b50
Merge remote-tracking branch 'mfd/for-next'

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