Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Wed, 9 May 2012 16:58:42 +0000 (09:58 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 9 May 2012 16:58:42 +0000 (09:58 -0700)
commitbfd17879866b36e95c58721da070d9f2ac7f8901
tree2381206a25ba7d664f4b787321ca5ce253e6a22c
parent743a6d923f803c861a24d173e1d1818ca8ac0384
parent414e41286e3aeb87de140ef4c75100f9344c32b2
Merge tag 'omap-devel-c-for-3.5' of git://git./linux/kernel/git/pjw/omap-pending into devel-hwmod-data

Some OMAP IP block data additions for 3.5, along with a
fix for a longstanding watchdog timer integration problem.