From: Tony Lindgren Date: Wed, 9 May 2012 16:58:42 +0000 (-0700) Subject: Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: firefly_0821_release~3680^2~2750^2~2^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bfd17879866b36e95c58721da070d9f2ac7f8901;p=firefly-linux-kernel-4.4.55.git 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. --- bfd17879866b36e95c58721da070d9f2ac7f8901