]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cdd854b b12d199)
Staging: Merge staging-next into Linus's tree
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 5 Aug 2010 21:18:03 +0000 (14:18 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 5 Aug 2010 21:18:03 +0000 (14:18 -0700)
commite9563355ac1175dd3440dc2ea5c28b27ed51a283
tree8546d55832714b5d19ba4c7799266918ca04882etree
parentcdd854bc42b5e6c79bbbc40c6600d995ffe6e747commit | diff
parentb12d1995f650e92f26184afd28e6cf40bf64467acommit | diff
Staging: Merge staging-next into Linus's tree

Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
15 files changed:
drivers/staging/Kconfig diff1 | diff2 | blob | history
drivers/staging/Makefile diff1 | diff2 | blob | history
drivers/staging/batman-adv/bat_sysfs.c diff1 | diff2 | blob | history
drivers/staging/batman-adv/hard-interface.c diff1 | diff2 | blob | history
drivers/staging/comedi/drivers/adl_pci9111.c diff1 | diff2 | blob | history
drivers/staging/comedi/drivers/cb_pcidda.c diff1 | diff2 | blob | history
drivers/staging/cx25821/cx25821-alsa.c diff1 | diff2 | blob | history
drivers/staging/hv/channel_mgmt.c diff1 | diff2 | blob | history
drivers/staging/hv/hv_utils.c diff1 | diff2 | blob | history
drivers/staging/hv/vmbus_drv.c diff1 | diff2 | blob | history
drivers/staging/memrar/memrar_handler.c diff1 | diff2 | blob | history
drivers/staging/rt2860/usb_main_dev.c diff1 | diff2 | blob | history
drivers/staging/rtl8192su/r8192U_core.c diff1 | diff2 | blob | history
drivers/staging/rtl8192u/r8192U_core.c diff1 | diff2 | blob | history
drivers/staging/winbond/wbusb.c diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror