projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6b16351 fafcdd5)
Merge tag 'omap-devel-c-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Mon, 25 Jun 2012 14:41:17 +0000 (07:41 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 25 Jun 2012 14:41:17 +0000 (07:41 -0700)
commit9a17d88e0586bb7189655f8f99484a872a474626
tree9e162e41ecdcef6c166b3b9378b2ff4c541d9555tree | snapshot
parent6b16351acbd415e66ba16bf7d473ece1574cf0bccommit | diff
parentfafcdd53220f44d7ae2f06a9ce20c8d550df2d9bcommit | diff
Merge tag 'omap-devel-c-for-3.6' of git://git./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
arch/arm/mach-omap2/omap_hwmod.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/pm34xx.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/prm2xxx_3xxx.c diff1 | diff2 | blob | history
Domain: System / Kernel;