git.osdn.net Git - tomoyo/tomoyo-test1.git/commit

(root) / tomoyo / tomoyo-test1.git / commit

author	Greg Kroah-Hartman <gregkh@suse.de>
	Wed, 13 Apr 2011 19:14:05 +0000 (12:14 -0700)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Wed, 13 Apr 2011 19:14:05 +0000 (12:14 -0700)
commit	32235b07b52e948900613e27c5cbd955d084ae8a
tree	92b887a4b3b925df4c8e729e72b0f2daac185dbf	tree \| snapshot
parent	59c23eabdae97a18cfc400339138f6d1dbde926a	commit \| diff
parent	a6360dd37e1a144ed11e6548371bade559a1e4df	commit \| diff

Staging: merge 2.6.39-rc3 into staging-next

This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

27 files changed:

drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/include/common/dbglog.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/include/common/epping_test.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/include/common/wmi.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/include/common/wmix.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/os/linux/ar6000_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/wmi/wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wlc_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/util/bcmsrom.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/util/hnddma.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/util/siutils.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/gma500/psb_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/gma500/psb_intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/blkvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/channel.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/channel_mgmt.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/connection.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/hv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/hv_mouse.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/hv_util.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/rndis_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/vmbus_drv.c	diff1 \|	diff2 \|	blob \| history

This is a test repository.

RSS Atom

About OSDN

Find Software

Develop Software

Help

drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/include/common/dbglog.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/include/common/epping_test.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/include/common/wmi.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/include/common/wmix.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/os/linux/ar6000_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/wmi/wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wlc_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/util/bcmsrom.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/util/hnddma.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/util/siutils.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/gma500/psb_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/gma500/psb_intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/blkvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/channel.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/channel_mgmt.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/connection.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/hv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/hv_mouse.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/hv_util.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/rndis_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/vmbus_drv.c	diff1 \|	diff2 \|	blob \| history