projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32235b0 f0e615c)
Staging: merge 2.6.39-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 19 Apr 2011 13:37:49 +0000 (06:37 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 19 Apr 2011 13:38:06 +0000 (06:38 -0700)
This handles the removal of the samsung-laptop driver and other
minor merge issues.

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

Trivial merge
John Crispins staging tree