]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitf0db1b2da916d02b0776383d03140affb69412aa
tree0b74288a377cc832d56283d5ba715b500df7e2e8
parent01576255ab343cc191c61ee1299c6e37461c63eb
parent0d011ae79144938f8ff62fc9f2c718c0cd348b50
Merge remote-tracking branch 'mfd/for-next'

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