Merge branch 'master' of ../master into next
authorWolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)
commit006915fbb0e3c1c9927fe32c4e92cb011f8499e7
treeb477df920f7d638a0472aa1d6bfa5ff71243448c
parent98e69567022eb2138dd99554b3a2e80522a1b153
parentb5d58d8500bfb918c7fec56f241e6ee1078c2be0
Merge branch 'master' of ../master into next
MAINTAINERS
boards.cfg
include/configs/omap4_sdp4430.h