diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 02:09:31 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 02:09:31 +0200 |
commit | 4b30b6f23a1a59cda29cc12566eb4f32a22a8069 (patch) | |
tree | 69e262a5065ce8be21c919febd29d5d9660f3e97 /tools | |
parent | Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux (diff) | |
parent | Merge branch 'omap/4460' of git+ssh://master.kernel.org/pub/scm/linux/kernel/... (diff) | |
download | linux-4b30b6f23a1a59cda29cc12566eb4f32a22a8069.tar.xz linux-4b30b6f23a1a59cda29cc12566eb4f32a22a8069.zip |
Merge branch 'next/soc' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions