From: Olof Johansson <olof@lixom.net>
Date: Wed, 9 May 2012 09:31:01 +0000 (-0700)
Subject: Merge tag 'v3.4-rc6' into next/cleanup
X-Git-Tag: v3.5-rc1~156^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5a2a1ba838f60d92bf67c5eef533e95453752cb;p=pandora-kernel.git

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>
---

d5a2a1ba838f60d92bf67c5eef533e95453752cb
Reading git-diff-tree failed