]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.3/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Sun, 18 Dec 2011 04:32:23 +0000 (20:32 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 18 Dec 2011 04:32:23 +0000 (20:32 -0800)
commitded926403a18e30288150dc6d784c829c315b8c9
treeaad0447b6c7edd8ab9a872312e4e8dc99c40678b
parentb27089a476f4e4093db5b7fe261ef60cfa9f6b4a
parentc3e00a0eff4c05717915ac7a8e4646db3882aebf
Merge branch 'for-3.3/dt' into for-next

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