| commit | 9a17d88e0586bb7189655f8f99484a872a474626 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Mon Jun 25 07:41:17 2012 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Mon Jun 25 07:41:17 2012 -0700 |
| tree | 9e162e41ecdcef6c166b3b9378b2ff4c541d9555 | |
| parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc [diff] | |
| parent | fafcdd53220f44d7ae2f06a9ce20c8d550df2d9b [diff] |
Merge tag 'omap-devel-c-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-pm Reimplement the OMAP PRCM I/O chain code. Needed for I/O wakeups to work correctly. Conflicts: arch/arm/mach-omap2/prm2xxx_3xxx.c