Merge tag 'omap-for-v3.13/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm...
authorKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 22:25:21 +0000 (15:25 -0700)
committerKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 22:25:32 +0000 (15:25 -0700)
From Tony Lindgren:
Fixes for omaps that were not considered urgent for the -rc series.
Just minor build fixes, removal of dead code, and a patch to
use the die ID for increasing boot time entropy.

* tag 'omap-for-v3.13/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: mach-omap1: Fix omap1510_fpga_init_irq() implicit declarations.
  ARM: OMAP1: fix incorrect placement of __initdata tag
  ARM: OMAP: remove deprecated IRQF_DISABLED
  ARM: OMAP2+: throw the die id into the entropy pool

Signed-off-by: Kevin Hilman <khilman@linaro.org>

Trivial merge