]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tegra/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 06:43:44 +0000 (16:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 06:43:44 +0000 (16:43 +1000)
commit74346883e5d885600ebb106298a6eeac9cb84e13
tree5bbb39dc53c80fa194d60d6492e5bf2aa8bd822f
parent30a312aefd3e988bbf0bb15d911d3e1f1a0ab9e8
parent904e11a5ff0e9aeeb660ffc6bf0d0cf4bf6a3871
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/devices.h
drivers/usb/phy/tegra_usb_phy.c
MAINTAINERS
arch/arm/Kconfig
arch/arm/mach-tegra/Makefile
drivers/mmc/host/sdhci-tegra.c
drivers/usb/phy/tegra_usb_phy.c