Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...

* '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)

diff --cc arch/arm/mach-mmp/pxa168.c
Simple merge

diff --cc arch/arm/mach-pxa/hx4700.c
Simple merge

diff --cc arch/arm/mach-pxa/pxa25x.c
Simple merge

diff --cc arch/arm/mach-pxa/pxa27x.c
Simple merge