projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
197f4d6
9eccca0
)
Merge 4.0-rc3 into staging-next
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 9 Mar 2015 07:13:01 +0000
(08:13 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 9 Mar 2015 07:13:01 +0000
(08:13 +0100)
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/comedi/drivers/adv_pci1710.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/comedi/drivers/comedi_isadma.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/staging/comedi/drivers/adv_pci1710.c
Simple merge
diff --cc
drivers/staging/comedi/drivers/comedi_isadma.c
Simple merge