Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <dmurphy@ti.com>
Mon, 29 Apr 2013 12:53:29 +0000 (07:53 -0500)
committerDan Murphy <dmurphy@ti.com>
Mon, 29 Apr 2013 12:53:29 +0000 (07:53 -0500)
commit76fbf612df49acd211375caae0f531a453d6a333
treedcba640ed4399c2a136041be20e5cebbe2f90abc
parentc3626554ea9210ddb77d1a333e05370ab02e6498
parent69f637a18ee07cf5ae562e3a8d0de08c6bfbee2b
Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.8.y

TI-Feature: platform_base
TI-Tree: git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y

* 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: dts: AM33XX: Set pinmux for clkout2 pad used for clock output
  ARM: OMAP AM33XX: clock data: Enable clkout2 as part of init
  ARM: dts: AM33XX: Add support for AM335x BeagleBone-Black
  ARM: compressed/head.S: work around new binutils warning
  ARM: OMAP3+: am33xx id: Check dev_feature register for available features
  ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers

Conflicts:
arch/arm/configs/omap2plus_defconfig
arch/arm/mach-omap2/control.h

Signed-off-by: Dan Murphy <dmurphy@ti.com>
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/mach-omap2/cclock33xx_data.c
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/io.c