]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitbfc05a8a432056ebd2c181e9bfb0226fe0ef5cdf
tree95b1579ac4f33788e05ff13e347372d266023188
parent103c43a2c6aaf7fc4932513e2991cdec60411b18
parent0d4f74792e2946cb2ef40a1673851eda1041358c
Merge branch 'for-3.3/dt' into for-next

Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/irq.c