summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx/nas100d-setup.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-10 09:15:30 -0800
committerOlof Johansson <olof@lixom.net>2012-03-10 09:15:30 -0800
commitc454f813501b94cd687bf3c5c0783f815a854905 (patch)
tree8b6e1719ba4470e478d719ca0cf935501370e237 /arch/arm/mach-ixp4xx/nas100d-setup.c
parent1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7 (diff)
parent63fc5f3bb3d0ca9ab4767a801b518aa6335f87ad (diff)
downloadblackbird-op-linux-c454f813501b94cd687bf3c5c0783f815a854905.tar.gz
blackbird-op-linux-c454f813501b94cd687bf3c5c0783f815a854905.zip
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)
Diffstat (limited to 'arch/arm/mach-ixp4xx/nas100d-setup.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud