]> git.neil.brown.name Git - gta04.git/commit
git / gta04.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e185124 d48b97b)
Merge tag 'v3.4-rc6' into next/cleanup
authorOlof Johansson <olof@lixom.net>
Wed, 9 May 2012 09:31:01 +0000 (02:31 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 9 May 2012 09:31:01 +0000 (02:31 -0700)
commitd5a2a1ba838f60d92bf67c5eef533e95453752cb
treef6436b5e2b430197f37e49ffff23e91ef694b303tree | snapshot
parente1851240a891a305946814587497f121b900b4becommit | diff
parentd48b97b403d23f6df0b990cee652bdf9a52337a3commit | diff
Merge tag 'v3.4-rc6' into next/cleanup

Linux 3.4-rc6

Resolve conflict where an u5500 file had a bugfix go in, but was
deleted in the branch staged for next merge window.

Signed-off-by: Olof Johansson <olof@lixom.net>
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/plat-omap/dma.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.