]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 103c43a 0d4f747)
Merge branch 'for-3.3/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 8 Dec 2011 05:22:08 +0000 (21:22 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 8 Dec 2011 05:22:08 +0000 (21:22 -0800)
Conflicts:
arch/arm/mach-tegra/Makefile

1  2 
arch/arm/mach-tegra/irq.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-tegra/irq.c
Simple merge
Linux kernel for KaRo TX COM modules