tree ecbd7238f1402783f122d2a1a0310bb2cdb1dd9a
parent b0af8dfdd67699e25083478c63eedef2e72ebd85
parent db47cccebd74e575963bc80cc5ac926399388a21
parent 345e397d841068c4ba2829a226fbe6613bac1d0d
author Arnd Bergmann <arnd@arndb.de> 1310932102 +0200
committer Arnd Bergmann <arnd@arndb.de> 1310932102 +0200

Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel-2