]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
projects / can-eth-gw-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eccfe8b 68b2532)
Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2...
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Oct 2012 13:33:38 +0000 (15:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Oct 2012 13:33:38 +0000 (15:33 +0200)
commit6767d05ed8f902ee3fcdc2e42cccb29524cf19e5
treefb44146fb3f2822f04985893104ca7b6434b9fd0tree | snapshot
parenteccfe8b75b09225187863ac9520a827b6400a8aacommit | diff
parent68b25325a7fd290b5e472bba0df9cbe8c1a81d8fcommit | diff
Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

Two bug fixes for the imx multi-platform support.

* 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx: select HAVE_IMX_SRC when SMP is enabled
  ARM: mach-imx: Fix selection of ARCH_MXC

Signed-off-by: Arnd Bergmann <arnd@arndb.de>