| commit | d5a2a1ba838f60d92bf67c5eef533e95453752cb | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed May 09 02:31:01 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Wed May 09 02:31:01 2012 -0700 |
| tree | f6436b5e2b430197f37e49ffff23e91ef694b303 | |
| parent | e1851240a891a305946814587497f121b900b4be [diff] | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 [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>