diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-25 16:41:17 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-25 16:41:17 +0200 |
| commit | 9a17d88e0586bb7189655f8f99484a872a474626 (patch) | |
| tree | 9e162e41ecdcef6c166b3b9378b2ff4c541d9555 /net/rxrpc | |
| parent | Linux 3.5-rc4 (diff) | |
| parent | ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle (diff) | |
| download | linux-9a17d88e0586bb7189655f8f99484a872a474626.tar.xz linux-9a17d88e0586bb7189655f8f99484a872a474626.zip | |
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
Diffstat (limited to 'net/rxrpc')
0 files changed, 0 insertions, 0 deletions