tree 8b6e1719ba4470e478d719ca0cf935501370e237
parent 1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7
parent 63fc5f3bb3d0ca9ab4767a801b518aa6335f87ad
author Olof Johansson <olof@lixom.net> 1331399730 -0800
committer Olof Johansson <olof@lixom.net> 1331399730 -0800

Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards

* 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: add minimal support for Nokia RM-696
  ARM: OMAP: enable Bluetooth on the PandaBoard
  ARM: OMAP: pandora: add support for backlight and poweroff
  ARM: OMAP4: board-4430sdp: don't initialize value that is never used
  ARM: OMAP3: cm-t3517: add EMAC support
  ARM: OMAP: move generic EMAC init to separate file
  ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpios
  ARM: OMAP: Add omap_reserve functionality

  (includes sync-up to 3.3-rc6)