From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jul 2011 00:09:31 +0000 (-0700)
Subject: Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux... 
X-Git-Tag: v3.1-rc1~153
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b30b6f23a1a59cda29cc12566eb4f32a22a8069;p=pandora-kernel.git

Merge branch 'next/soc' of git://git./linux/kernel/git/arm/linux-arm-soc

* 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  MAINTAINERS: add maintainer of CSR SiRFprimaII machine
  ARM: CSR: initializing L2 cache
  ARM: CSR: mapping early DEBUG_LL uart
  ARM: CSR: Adding CSR SiRFprimaII board support
  OMAP4: clocks: Update the clock tree with 4460 clock nodes
  OMAP4: PRCM: OMAP4460 specific PRM and CM register bitshifts
  OMAP4: ID: add omap_has_feature for max freq supported
  OMAP: ID: introduce chip detection for OMAP4460
  ARM: Xilinx: merge board file into main platform code
  ARM: Xilinx: Adding Xilinx board support

Fix up conflicts in arch/arm/mach-omap2/cm-regbits-44xx.h
---

4b30b6f23a1a59cda29cc12566eb4f32a22a8069
Reading git-diff-tree failed