diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 20:48:42 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-04 20:50:07 +0000 |
| commit | 18bb4fb28760b3d23355f6e3cc3cbe1a07321c0a (patch) | |
| tree | 8adc1e462e04d6dcbc0669657adb356368db8c9e /scripts/unifdef.c | |
| parent | 1220547bfd7f7dd97f770a04b533323e5404b8e9 (diff) | |
| parent | f6a1ba67362fe78a1ec81c355ee638c70689b5d7 (diff) | |
Merge tag 'tegra-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/cleanups
Minor fixes that weren't urgent enough to go into 3.3. The two paz00
patches are in mainline already but got merged after the branch point
for this branch, so they're duplicated. I also ended up merging in
rmk/for-armsoc into this later on to fix a bug introduced by it, so it's
included but it's not the base of this branch.
* tag 'tegra-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
ARM: tegra: Enable CPUIdle on Tegra20
ARM: tegra: export usb phy symbols
ARM: tegra: build localtimer support only when needed
ARM: tegra: select CPU_FREQ_TABLE
ARM: tegra: select required CPU and L2 errata options
ARM: tegra: paz00: fix wrong UART port on mini-pcie plug
ARM: tegra: paz00: fix wrong SD1 power gpio
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'scripts/unifdef.c')
0 files changed, 0 insertions, 0 deletions