projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 03fa6fc cf7d7e5)
Staging: Merge 2.6.37-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 7 Dec 2010 18:47:56 +0000 (10:47 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 7 Dec 2010 18:47:56 +0000 (10:47 -0800)
commitea3398a1ae54cd3403f3cc0f6aa498c7452c681a
tree19903cfd3eb11f6cdd84f3b6923e604028178150tree | snapshot
parent03fa6fc5a68242ddd7cc3ba4255fe6f65b21ce41commit | diff
parentcf7d7e5a1980d1116ee152d25dac382b112b9c17commit | diff
Staging: Merge 2.6.37-rc5 into staging-next

This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly.  It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
12 files changed:
drivers/staging/asus_oled/asus_oled.c diff1 | diff2 | blob | history
drivers/staging/batman-adv/hard-interface.c diff1 | diff2 | blob | history
drivers/staging/comedi/drivers/usbdux.c diff1 | diff2 | blob | history
drivers/staging/easycap/easycap.h diff1 | diff2 | blob | history
drivers/staging/go7007/go7007-driver.c diff1 | diff2 | blob | history
drivers/staging/hv/storvsc_drv.c diff1 | diff2 | blob | history
drivers/staging/intel_sst/intel_sst_app_interface.c diff1 | diff2 | blob | history
drivers/staging/intel_sst/intel_sst_stream_encoded.c diff1 | diff2 | blob | history
drivers/staging/rt2860/usb_main_dev.c diff1 | diff2 | blob | history
drivers/staging/rtl8712/osdep_service.h diff1 | diff2 | blob | history
drivers/staging/spectra/ffsport.c diff1 | diff2 | blob | history
drivers/staging/udlfb/udlfb.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;