From: Tony Lindgren Date: Mon, 8 Apr 2013 18:24:39 +0000 (-0700) Subject: Merge tag 'omap-for-v3.10/cleanup-v2-signed' into omap-for-v3.10/tmp-merge X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc4e97720e310d6b45360a5ea1b7d35fca1861e6;p=pandora-kernel.git Merge tag 'omap-for-v3.10/cleanup-v2-signed' into omap-for-v3.10/tmp-merge Clean up related changes for v3.10 merge window. Mostly clock and PM related with removal of now unused DMA channel definitions. The clock change to use SoC specific lists will make it a little bit easier to add support for new SoCs variants without having to patch all over the place. Conflicts: arch/arm/mach-omap2/cclock44xx_data.c --- fc4e97720e310d6b45360a5ea1b7d35fca1861e6 Reading git-diff-tree failed