git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e95c54 b98138e)
Merge branch 'next/cleanup2' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:25:41 +0000 (14:25 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:25:41 +0000 (14:25 -0700)
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-bcmring/arch.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/dma.c


Trivial merge
Pandora Kernel Repository