diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 15:15:54 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 15:15:54 +0100 |
| commit | a46052c1941fd5ac1d8a73f1be32283493f21562 (patch) | |
| tree | c91fd17c85c91deb707375129956538d3be2b91d /arch/arm/mach-omap1/dma.c | |
| parent | Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/... (diff) | |
| parent | ARM: shmobile: leave CONFIG_INOTIFY_USER enabled by default (diff) | |
| download | linux-a46052c1941fd5ac1d8a73f1be32283493f21562.tar.xz linux-a46052c1941fd5ac1d8a73f1be32283493f21562.zip | |
Merge branch 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman:
"I will work on the suggestions by Arnd to reduce the number
of defconfigs for shmobile - in essence moving towards one or
two generic configs rather than per-board configs. However,
this seems to be somewhat non-trivial and in the mean time
I would like to keep updating the existing defcoings."
* 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: leave CONFIG_INOTIFY_USER enabled by default
ARM: shmobile: armadillo800eva: enable L2X0 cache on defconfig
ARM: shmobile: mackerel: defconfig update
Diffstat (limited to 'arch/arm/mach-omap1/dma.c')
0 files changed, 0 insertions, 0 deletions