]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41f1072 413541d)
Merge 3.13-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2013 17:43:21 +0000 (09:43 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2013 17:43:21 +0000 (09:43 -0800)
We want these fixes here to handle some merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.