From: Tony Lindgren Date: Thu, 10 May 2012 18:17:23 +0000 (-0700) Subject: Merge tag 'omap-cleanup-devices-for-v3.5' into tmp-merge X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aa645c47f2c3783efb2ffb7a780be76e23a1e27;p=pandora-kernel.git Merge tag 'omap-cleanup-devices-for-v3.5' into tmp-merge Changes to split plat-omap/devices.c into mach-omap1 and mach-omap2 except for the RNG driver that will be done later on. As this depends on omap-devel-hwmod-data-for-v3.5 and causes merge conflict with omap-fixes-non-critical-for-v3.5, this branch is based on merge of the two. --- 6aa645c47f2c3783efb2ffb7a780be76e23a1e27 Reading git-diff-tree failed