OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b4e8459
15c03dd
)
Merge 3.12-rc3 into staging-next
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 30 Sep 2013 01:42:21 +0000
(18:42 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 30 Sep 2013 01:42:21 +0000
(18:42 -0700)
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/rtl8188eu/os_dep/ioctl_linux.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/rtl8188eu/os_dep/usb_intf.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/rtl8192u/r819xU_cmdpkt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/vt6656/iwctl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/vt6656/rxtx.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
Simple merge
diff --cc
drivers/staging/rtl8188eu/os_dep/usb_intf.c
Simple merge
diff --cc
drivers/staging/rtl8192u/r819xU_cmdpkt.c
Simple merge
diff --cc
drivers/staging/vt6656/iwctl.c
Simple merge
diff --cc
drivers/staging/vt6656/rxtx.c
Simple merge