projects / linux-flexiantxendom0.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 06fc884 e53beac)
Staging: Merge 2.6.37-rc2 into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 16 Nov 2010 18:44:50 +0000 (10:44 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 16 Nov 2010 18:44:50 +0000 (10:44 -0800)
commit491acf0032c08a74a4c88032ca1c03b498bfec37
treeb7194d3afb144fa007d0ca6a11c96297f36d42f8tree | snapshot
parent06fc8846a2c0ddcc51e6666a78fc29a8e749ca3bcommit | diff
parente53beacd23d9cb47590da6a7a7f6d417b941a994commit | diff
Staging: Merge 2.6.37-rc2 into staging-next

This was necessary in order  to resolve some conflicts that happened
between -rc1 and -rc2 with the following files:
drivers/staging/bcm/Bcmchar.c
drivers/staging/intel_sst/intel_sst_app_interface.c

All should be resolved now.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
12 files changed:
drivers/staging/bcm/Bcmchar.c diff1 | diff2 | blob | history
drivers/staging/brcm80211/brcmfmac/dhd_linux.c diff1 | diff2 | blob | history
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c diff1 | diff2 | blob | history
drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c diff1 | diff2 | blob | history
drivers/staging/hv/hv_utils.c diff1 | diff2 | blob | history
drivers/staging/intel_sst/intel_sst_app_interface.c diff1 | diff2 | blob | history
drivers/staging/keucr/ms.c diff1 | diff2 | blob | history
drivers/staging/rt2860/usb_main_dev.c diff1 | diff2 | blob | history
drivers/staging/rtl8192e/r8192E_core.c diff1 | diff2 | blob | history
drivers/staging/udlfb/udlfb.c diff1 | diff2 | blob | history
drivers/staging/wlan-ng/p80211netdev.c diff1 | diff2 | blob | history
drivers/usb/serial/option.c diff1 | diff2 | blob | history
Port of xen3.3 xenlinux code to Ubuntu Precise kernel (3.2)