projects / profile / ivi / kernel-adaptation-intel-automotive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 391a169 5bf6859)
Staging: Merge Ben Collins solo6x10 tree with upstream
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 10 Nov 2010 00:12:37 +0000 (16:12 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 10 Nov 2010 00:12:37 +0000 (16:12 -0800)
There were some duplicate changes that needed to be hand-merged due to
fixes needed to keep .37 building and working properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge
Domain: System / Uncategorized;