git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e38834f 1f685b3)
Merge branch 'for-next'
authorTony Lindgren <tony@atomide.com>
Thu, 3 Sep 2009 21:02:11 +0000 (14:02 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 3 Sep 2009 21:02:11 +0000 (14:02 -0700)
Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-zoom2.c
arch/arm/mach-omap2/mux.c
arch/arm/mach-omap2/pm-debug.c
arch/arm/plat-omap/include/mach/mux.h


Trivial merge
Pandora Kernel Repository