q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/staging
History
David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/qmi_wwan.c

The qmi_wwan merge was trivial.

The caif_hsi.c, on the other hand, was not.  It's a conflict between
1c385f1fdf ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.

I did my best with that one and will ask Sjur to check it out.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2012-06-28 17:37:00 -07:00
..
android mm/fs: route MADV_REMOVE to FALLOC_FL_PUNCH_HOLE 2012-05-29 16:22:22 -07:00
asus_oled
…
bcm Staging: bcm: Remove two unused variables from Adapter.h 2012-05-18 17:41:16 -07:00
ccg staging: usb: gadget: Add FunctionFS support to Configurable Composite Gadget driver 2012-05-16 05:32:20 -07:00
comedi staging/comedi: fix build for USB not enabled 2012-06-11 16:49:35 -07:00
cptm1217
…
crystalhd
…
cxt1e1
…
echo
…
et131x
…
frontier
…
ft1000
…
gdm72xx Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-28 17:37:00 -07:00
iio staging:iio:ad7298: Fix linker error due to missing IIO kfifo buffer 2012-06-12 11:12:19 -07:00
ipack Staging: ipack/bridges/tpci200: remove unneeded casts 2012-05-18 17:38:17 -07:00
keucr
…
line6 staging: line6/config.h: Delete unused header 2012-05-18 17:13:52 -07:00
media Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-06-25 14:53:09 -07:00
net
…
nvec
…
octeon Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
olpc_dcon
…
omapdrm staging: omapdrm: fix crash when freeing bad fb 2012-06-11 08:42:09 -07:00
ozwpan
…
panel
…
phison
…
quickstart
…
ramster Frontswap provides a "transcendent memory" interface for swap pages. 2012-06-04 12:28:45 -07:00
rtl8187se staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
rtl8192e staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
rtl8192u staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
rtl8712 staging: r8712u: Add new USB IDs 2012-06-15 14:50:04 -07:00
rts5139 staging: "rts5139" Fix typos. 2012-05-14 13:31:09 -07:00
rts_pstor
…
sbe-2t3e3
…
sep
…
serqt_usb2 USB: serqt_usb2: remove duplicate device ids 2012-05-10 14:13:17 -07:00
slicoss
…
sm7xx
…
speakup
…
ste_rmi4
…
telephony
…
tidspbridge
…
usbip Revert "staging: usbip: bugfix for stack corruption on 64-bit architectures" 2012-06-12 11:10:50 -07:00
vme
…
vt6655
…
vt6656 staging: Remove test of is_broadcast with is_multicast 2012-05-09 13:52:23 -07:00
winbond
…
wlags49_h2 Staging: wlags49_h2: potential NULL dereference 2012-05-14 15:43:44 -07:00
wlags49_h25
…
wlan-ng
…
xgifb
…
zcache Frontswap provides a "transcendent memory" interface for swap pages. 2012-06-04 12:28:45 -07:00
zram
…
zsmalloc
…
Kconfig Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
Makefile Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
staging.c
…