Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 ... This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file, and it fixes the build error in the arch/x86/kernel/microcode_core.c file, that the merge did not catch. The microcode_core.c patch was provided by Stephen Rothwell <sfr@canb.auug.org.au> who was invaluable in the merge issues involved with the large sysdev removal process in the driver-core tree. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2012-01-06 11:42:52 -08:00
..
asus_oled
bcm
comedi	Staging: comedi: fix integer overflow in do_insnlist_ioctl()	2011-11-28 04:38:45 +09:00
cptm1217
crystalhd
cxt1e1	staging: Add module.h to more drivers implicitly using it.	2011-10-31 19:32:10 -04:00
echo
et131x	staging: fix more ET131X build errors	2011-11-18 15:00:54 -08:00
frontier	USB: convert drivers/staging/* to use module_usb_driver()	2011-11-18 09:42:11 -08:00
ft1000	USB: convert drivers/staging/* to use module_usb_driver()	2011-11-18 09:42:11 -08:00
gma500	staging: Add module.h to more drivers implicitly using it.	2011-10-31 19:32:10 -04:00
hv
iio	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
intel_sst	staging: Add module.h to more drivers implicitly using it.	2011-10-31 19:32:10 -04:00
keucr	USB: convert drivers/staging/* to use module_usb_driver()	2011-11-18 09:42:11 -08:00
line6
media	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
mei
nvec
octeon	STAGING: octeon-ethernet: Fix compile error caused by skb_frag_struct change	2011-11-09 17:14:27 +00:00
olpc_dcon
panel
phison
pohmelfs	filesystems: add set_nlink()	2011-11-02 12:53:43 +01:00
quatech_usb2
quickstart
rtl8187se
rtl8192e
rtl8192u
rtl8712	staging: r8712u: Add new USB ID	2011-12-13 16:13:15 -08:00
rts5139	USB: convert drivers/staging/* to use module_usb_driver()	2011-11-18 09:42:11 -08:00
rts_pstor	staging:rts_pstor:Complete scanning_done variable	2011-11-26 17:37:39 -08:00
sbe-2t3e3
sep
serial
serqt_usb2
slicoss	staging: slicoss depends on NET	2011-11-18 15:00:48 -08:00
sm7xx
speakup
spectra	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
ste_rmi4
tidspbridge	staging: tidspbridge: request dmtimer clocks on init	2011-12-13 16:12:06 -08:00
usbip	staging: usbip: bugfix for deadlock	2011-11-26 17:37:38 -08:00
vme
vt6655
vt6656	USB: convert drivers/staging/* to use module_usb_driver()	2011-11-18 09:42:11 -08:00
winbond	USB: convert drivers/staging/* to use module_usb_driver()	2011-11-18 09:42:11 -08:00
wlags49_h2	staging: Add module.h to more drivers implicitly using it.	2011-10-31 19:32:10 -04:00
wlags49_h25
wlan-ng	USB: convert drivers/staging/* to use module_usb_driver()	2011-11-18 09:42:11 -08:00
xgifb
zcache
zram	Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block	2011-11-04 17:06:58 -07:00
Kconfig	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00
Makefile	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00
staging.c