projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a145928
a937536
)
Merge 3.9-rc3 into staging-next
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 18 Mar 2013 16:34:14 +0000
(09:34 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 18 Mar 2013 16:34:14 +0000
(09:34 -0700)
This resolves the merge error due to removing the ccg staging driver,
and picks up the other staging driver fixes that went into 3.9-rc3.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/comedi/drivers/usbdux.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/comedi/drivers/usbduxsigma.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/vt6656/card.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/vt6656/main_usb.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/staging/comedi/drivers/usbdux.c
Simple merge
diff --cc
drivers/staging/comedi/drivers/usbduxsigma.c
Simple merge
diff --cc
drivers/staging/vt6656/card.c
Simple merge
diff --cc
drivers/staging/vt6656/main_usb.c
Simple merge