]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.3/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 19:03:18 +0000 (11:03 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 19:03:18 +0000 (11:03 -0800)
commitc7aa8dcf42bd9c3ee4fd14474d45e3f2c27dd796
treee24000bdaa130cde6b5deb59238778d473d6a267
parent4e5fbebaf7e6344197e9169b1690bb4347682e5c
parent6cc04a4420391c3f034afe8ea6e28d75912a70a3
Merge branch 'for-3.3/soc' into for-next

Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/include/mach/entry-macro.S
arch/arm/Kconfig
arch/arm/kernel/perf_event.c
arch/arm/kernel/setup.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/mach-tegra/include/mach/entry-macro.S
arch/arm/mach-tegra/irq.c
mm/vmalloc.c