diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-28 02:19:15 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-28 02:19:15 +0200 |
| commit | b521d929b330d665cb3a42b26eaaa5690dc9dad7 (patch) | |
| tree | 7c1ddf1c06922c4728b6625fb10cf11de5a29387 /arch/arm/mach-w90x900 | |
| parent | Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux i... (diff) | |
| parent | Merge tag 'tegra-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/t... (diff) | |
| download | linux-b521d929b330d665cb3a42b26eaaa5690dc9dad7.tar.xz linux-b521d929b330d665cb3a42b26eaaa5690dc9dad7.zip | |
Merge branch 'tegra/soc' into next/cleanup2
Conflicts:
arch/arm/mach-tegra/Makefile
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-w90x900')
0 files changed, 0 insertions, 0 deletions