git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
af0c25c
fe0d422
)
Merge Linux 3.0-rc6 into staging-next
author
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 5 Jul 2011 14:35:09 +0000
(07:35 -0700)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Tue, 5 Jul 2011 14:35:09 +0000
(07:35 -0700)
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff