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
..
accessibility
acpi	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
amba
ata	pata_of_platform: Add missing CONFIG_OF_IRQ dependency.	2011-12-22 15:00:32 -05:00
atm
auxdisplay
base	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
bcma
block	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2011-12-16 10:05:14 -08:00
bluetooth	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
cdrom
char	ipmi_watchdog: restore settings when BMC reset	2011-12-20 10:25:04 -08:00
clk
clocksource
connector
cpufreq	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
cpuidle	cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem	2011-12-21 14:29:42 -08:00
crypto	Merge git://github.com/herbertx/crypto	2011-11-25 21:55:07 -08:00
dca
devfreq
dio
dma	dma: MX3_IPU fix depends	2011-12-19 12:26:07 +01:00
edac	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
eisa
firewire
firmware	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
gpio	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
gpu	drm/radeon/kms/atom: fix possible segfault in pm setup	2012-01-03 09:17:16 +00:00
hid	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
hv	Drivers:hv: Fix a bug in vmbus_driver_unregister()	2012-01-04 16:14:44 -08:00
hwmon	hwmon: (jz4740) Staticise jz4740_hwmon_driver	2011-12-12 08:31:21 -08:00
hwspinlock
i2c	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide	2011-11-18 22:04:12 -02:00
idle
ieee802154
infiniband	Merge branches 'cma', 'mlx4' and 'qib' into for-next	2011-12-19 09:19:49 -08:00
input	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
iommu	Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	2011-12-29 17:36:15 -08:00
isdn	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
leds	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
lguest
macintosh	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
mca
md	md/bitmap: It is OK to clear bits during recovery.	2011-12-23 09:57:48 +11:00
media	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
memstick
message
mfd	mfd: Include linux/io.h to jz4740-adc	2011-12-20 18:53:26 +01:00
misc	Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc	2011-11-21 20:36:05 -08:00
mmc	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
mtd	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
net	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
nfc	USB: convert some miscellanies drivers to use module_usb_driver()	2011-11-18 09:52:10 -08:00
nubus
of	dt/device: Fix auxdata matching to handle entries without a name override	2011-12-12 14:41:45 -07:00
oprofile	oprofile: Fix uninitialized memory access when writing to writing to oprofilefs	2011-12-19 17:18:43 +01:00
parisc
parport
pci	pci: Fix hotplug of Express Module with pci bridges	2011-12-18 14:10:16 -08:00
pcmcia
pinctrl
platform	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
pnp
power	x86/mrst: Battery fixes	2011-12-05 17:06:37 +01:00
pps
ps3
ptp	ptp: Fix clock_getres() implementation	2011-12-06 11:38:32 +01:00
rapidio	rapidio/tsi721: modify PCIe capability settings	2011-12-09 07:50:29 -08:00
regulator	regulator: twl: fix twl4030 support for smps regulators	2011-11-28 18:58:31 +00:00
rtc	Revert "rtc: Expire alarms after the time is set."	2012-01-04 07:57:22 -08:00
s390	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
sbus	sbus: convert drivers/sbus/char/* to use module_platform_driver()	2011-12-04 10:46:58 -08:00
scsi	[SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority	2011-12-15 11:02:07 +04:00
sfi
sh	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
sn
spi	spi/gpio: fix section mismatch warning	2011-12-07 22:17:39 +01:00
ssb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2011-12-09 14:07:12 -05:00
staging	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
target	iscsi-target: Fix hex2bin warn_unused compile message	2011-12-06 06:00:59 +00:00
tc
telephony
thermal
tty	Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty	2011-11-21 20:36:46 -08:00
uio	uio: convert drivers/uio/* to use module_platform_driver()	2011-11-26 20:12:48 -08:00
usb	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
uwb	USB: convert some miscellanies drivers to use module_usb_driver()	2011-11-18 09:52:10 -08:00
vhost
video	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
virt
virtio	virtio-pci: make reset operation safer	2011-11-24 13:04:48 +10:30
vlynq
w1	w1: add fast search for single slave bus	2011-12-09 19:19:18 -08:00
watchdog	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
xen	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
zorro
Kconfig	hv: Move Kconfig menu entry	2011-11-26 17:05:33 -08:00
Makefile