Merge branch 'for-3.4/cleanup-and-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/cleanups

Browse source

* '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

...

This commit is contained in:

Arnd Bergmann 2012-03-19 21:00:48 +00:00

parent 849ad9d819 279b658525

commit ed1b4acc43

3 changed files with 17 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/arm/mach-tegra/Kconfig

View file

6

arch/arm/mach-tegra/board-harmony-pinmux.c

View file

16

arch/arm/mach-tegra/pcie.c

View file