git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
06fc884
e53beac
)
Staging: Merge 2.6.37-rc2 into staging-next
author
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 16 Nov 2010 18:44:50 +0000
(10:44 -0800)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 16 Nov 2010 18:44:50 +0000
(10:44 -0800)
This was necessary in order to resolve some conflicts that happened
between -rc1 and -rc2 with the following files:
drivers/staging/bcm/Bcmchar.c
drivers/staging/intel_sst/intel_sst_app_interface.c
All should be resolved now.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Trivial merge