git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ffdea3 4a10c2a)
Merge 3.12-rc2 into staging-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Sep 2013 15:59:04 +0000 (08:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Sep 2013 15:59:04 +0000 (08:59 -0700)
This resolves the merge problem with two iio drivers that Stephen
Rothwell pointed out.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Trivial merge
Pandora Kernel Repository