diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 16:41:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 16:41:28 +0200 |
| commit | 4c4945392dd20b1cbd98f1361eff3fc61905c7fc (patch) | |
| tree | 608c82141af82e0f129d9fb2d6d9494acc0dc42e /arch/arm/mach-gemini | |
| parent | 51ef519cbd4c9d7478c4050845ffb1cdc4e70fc1 (diff) | |
| parent | e60a8fe1792dcd3aacda0959e0f4865bfefb7bb5 (diff) | |
Merge tag 'omap-for-v4.1/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Merge "Few fixes for omap clocks, PRM and hwmod code" from Tony Lindgren:
- Fix bogus comparison of struct clk pointers, turns out
we can fix it by just removing the comparison
- Fix am437 hardreset implementation and remove boottime
warnings by adding the VPFE hwmod data
- Regression fix for am43xx PRM code, simplify things
by reusing the omap4 PRM implementation
* tag 'omap-for-v4.1/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Remove bogus struct clk comparison for timer clock
ARM: AM33xx+: hwmod: re-use omap4 implementations for reset functionality
ARM: OMAP4+: PRM: add support for passing status register/bit info to reset
ARM: AM43xx: hwmod: add VPFE hwmod entries
Diffstat (limited to 'arch/arm/mach-gemini')
0 files changed, 0 insertions, 0 deletions