diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-28 06:21:44 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-28 06:24:03 +0200 |
| commit | 1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544 (patch) | |
| tree | 41ea81fdecc67d766789ea3e46b1a49773dc8ec4 /arch/arm/mach-exynos | |
| parent | Merge branch 'next/soc-exynos5250-gpio' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | Merge branch 'fixes' into next/fixes-non-critical (diff) | |
| download | linux-1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544.tar.xz linux-1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544.zip | |
Merge branch 'fixes-non-critical' into next/drivers2
fixes-non-critical has already been merged upstream, and there are a
handful of annoying context conflicts that it makes sense to resolve
before sending up. Part of this is because there was parallel development
going on between more urgent fixes and general driver fixups, it should
settle down once the lpc32xx platform reaches a more steady state.
Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-lpc32xx/common.h
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-exynos')
0 files changed, 0 insertions, 0 deletions