HACK merge fixups for compile
authorDan Willemsen <dwillemsen@nvidia.com>
Sun, 23 Oct 2011 07:19:18 +0000 (00:19 -0700)
committerDan Willemsen <dwillemsen@nvidia.com>
Thu, 1 Dec 2011 05:52:34 +0000 (21:52 -0800)
commit6b8121f30d001e2cbae6ede6822f70c73dc3100a
tree32edee2c1d52b1d3390805fb1950537e84d07d2f
parentc788a318f6d5e8ebf44286fedddad6c15c4a617c
HACK merge fixups for compile

Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
arch/arm/mach-tegra/board-harmony.c
arch/arm/vfp/vfpmodule.c
drivers/gpio/gpio-tegra.c
drivers/i2c/busses/i2c-tegra.c
drivers/mmc/host/sdhci-tegra.c
drivers/spi/spi-tegra.c
drivers/usb/gadget/f_adb.c
drivers/usb/gadget/f_mtp.c
fs/proc/base.c
include/net/bluetooth/l2cap.h