git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
Pandora Kernel Repository