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 /drivers/gpu/drm/i915/i915_debugfs.c | |
parent | 271c8f9afae76a897408c277f9fae4c28bc0c64d (diff) | |
parent | a0a56db9771f57667daff41cfa2546dad1abe6d9 (diff) |
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 'drivers/gpu/drm/i915/i915_debugfs.c')
0 files changed, 0 insertions, 0 deletions