diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 13:49:42 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 13:50:15 +0200 |
commit | 21cb7963aa4ba59efb293c6dea00e3fc291090f8 (patch) | |
tree | b8a4deb12f99ccd32c70873dcced889bc9eef3ff /arch/arm/kernel/head.S | |
parent | Merge tag 'renesas-boards2-for-v3.10' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | ARM: davinci: use is IS_ENABLED macro (diff) | |
download | linux-21cb7963aa4ba59efb293c6dea00e3fc291090f8.tar.xz linux-21cb7963aa4ba59efb293c6dea00e3fc291090f8.zip |
Merge tag 'davinci-for-v3.10/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/boards
From Sekhar Nori <nsekhar@ti.com>:
v3.10 board updates for DaVinci
This pull request enables CGROUPS in defconfig and also
cleans up mach-davinci to use IS_ENABLED() macro.
* tag 'davinci-for-v3.10/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: use is IS_ENABLED macro
ARM: davinci: defconfig: enable CGROUPS
Includes an update to v3.9-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/kernel/head.S')
0 files changed, 0 insertions, 0 deletions