From: Olof Johansson Date: Wed, 9 May 2012 16:03:34 +0000 (-0700) Subject: Merge tag 'omap-fixes-for-v3.4-rc6-take-2' of git://git.kernel.org/pub/scm/linux... X-Git-Url: http://git.alex.org.uk Merge tag 'omap-fixes-for-v3.4-rc6-take-2' of git://git./linux/kernel/git/tmlind/linux-omap into fixes Fix two board spefific regressions and one regression caused by bad documentation By Archit Taneja (1) and others via Tony Lindgren * tag 'omap-fixes-for-v3.4-rc6-take-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: igep0020: fix smsc911x dummy regulator id ARM: OMAP: Revert "ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields" ARM: OMAP1: Amstrad Delta: Fix wrong IRQ base in FIQ handler --- e396dbd4ed2ccfd362261b05027bbdccec192b14