diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 21:00:48 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 21:00:48 +0000 |
commit | ed1b4acc43b0c3289faa30cf184f322ab70a5be3 (patch) | |
tree | fc953baee9a383fe7f92c50e34a7a0c641f096a9 /arch/arm/mach-s5pc100/common.c | |
parent | 849ad9d819f668d4bb6314f102bd92d16ab98622 (diff) | |
parent | 279b658525abd06645938fb607860de42c4cf31e (diff) |
Merge branch 'for-3.4/cleanup-and-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/cleanups
* 'for-3.4/cleanup-and-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
ARM: tegra: select USB_ULPI if USB is selected
arm/tegra: pcie: fix return value of function
arm/tegra: add timeout to PCIe PLL lock detection loop
arm/tegra: fix harmony pinmux for PCIe
Diffstat (limited to 'arch/arm/mach-s5pc100/common.c')
0 files changed, 0 insertions, 0 deletions