Linus Torvalds 3455229fd6 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/kvm: Fix build failure with HV KVM and CBE powerpc/ps3: Fix lv1_gpu_attribute hcall powerpc/ps3: Fix PS3 repository build warnings powerpc/ps3: irq: Remove IRQF_DISABLED powerpc/irq: Remove IRQF_DISABLED powerpc/numa: NUMA topology support for PowerNV powerpc: Add System RAM to /proc/iomem powerpc: Add KVM as module to defconfigs powerpc/kvm: Fix build with older toolchains powerpc, tqm5200: update tqm5200_defconfig to fit for charon board. powerpc/5200: add support for charon board		2011-11-12 00:01:51 -02:00
..
accessibility
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2011-11-07 10:13:52 -08:00
amba
ata	pata_of_platform: Don't use NO_IRQ	2011-11-10 15:57:59 -05:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2011-10-25 13:25:22 +02:00
auxdisplay
base	PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())	2011-11-08 22:34:00 +01:00
bcma	bcma: fix implicit use of export.h contents	2011-10-31 19:32:02 -04:00
block	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-07 10:55:33 -08:00
cdrom
char	agp: iommu_gfx_mapped only available if CONFIG_INTEL_IOMMU is set	2011-11-08 10:50:27 +00:00
clk
clocksource	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
connector
cpufreq	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
cpuidle	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2011-11-07 10:13:52 -08:00
crypto	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
dca	drivers/dca: Add export.h for THIS_MODULE to dca-sysfs.c	2011-10-31 19:31:43 -04:00
devfreq
dio
dma	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
edac	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
eisa
firewire	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
firmware	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
gpio	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
gpu	Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux	2011-11-11 23:43:51 -02:00
hid	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
hv
hwmon	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
hwspinlock	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-08 18:34:16 -08:00
i2c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
ide	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
idle	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2011-11-07 10:13:52 -08:00
ieee802154
infiniband	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
input	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
iommu	intel-iommu: now needs export.h for EXPORT_SYMBOL_GPL	2011-10-31 19:32:14 -04:00
isdn	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
leds	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
lguest	lguest: add export.h to lguest files for THIS_MODULE/EXPORT_SYMBOL	2011-10-31 19:32:13 -04:00
macintosh
mca
md	md/raid5: STRIPE_ACTIVE has lock semantics, add barriers	2011-11-08 16:22:06 +11:00
media	drivers/media: video/a5k6aa is a module and so needs module.h	2011-11-08 14:56:50 -05:00
memstick	drivers/memstick: Add module.h to the prev. implicit modular users	2011-10-31 19:31:52 -04:00
message	drivers/message: Add module.h to i2o/pci.c	2011-10-31 19:31:53 -04:00
mfd	mfd: fix build failures in recently added ab5500 code	2011-11-07 21:45:14 -05:00
misc	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
mmc	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
mtd	MTD: MAPS: bcm963xx-flash.c: explicitly include module.h	2011-11-07 21:26:55 -05:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-07 10:55:33 -08:00
nfc	drivers/nfc: add module.h to nfcwilink.c	2011-10-31 19:31:54 -04:00
nubus
of	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
oprofile
parisc	parisc: add module.h to files really requiring it	2011-10-31 19:31:01 -04:00
parport
pci	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pcmcia	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pinctrl	pinctrl: EXPORT_SYMBOL needs export.h	2011-10-31 19:32:21 -04:00
platform	x86 platform drivers: add POWER_SUPPLY to selected drivers for Dell	2011-11-08 12:49:29 -08:00
pnp	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2011-11-07 10:13:52 -08:00
power	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pps	pps gpio client: add missing dependency	2011-11-02 16:07:02 -07:00
ps3	powerpc/ps3: irq: Remove IRQF_DISABLED	2011-11-08 14:51:46 +11:00
ptp
rapidio	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
regulator	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
rtc	vrtc: change its year offset from 1960 to 1972	2011-11-11 23:58:58 -02:00
s390	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
sbus
scsi	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
sfi	drivers/sfi: sfi_acpi.c needs sysfs.h	2011-10-31 19:31:57 -04:00
sh	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
sn
spi	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
ssb	ssb: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:32:08 -04:00
staging	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
target	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
tc
telephony
thermal	thermal: Prevent polling from happening during system suspend	2011-11-06 20:38:49 -05:00
tty	n_gsm: Fix timings	2011-11-08 10:10:20 -08:00
uio	uio: Add module.h to implicit drivers/uio users	2011-10-31 19:32:10 -04:00
usb	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
uwb	uwb: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required	2011-10-31 19:32:19 -04:00
vhost
video	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
virt
virtio	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
vlynq
w1	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
watchdog	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
xen	Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-11-06 20:13:34 -08:00
zorro	drivers/zorro: Add export.h to proc.c	2011-10-31 19:32:01 -04:00
Kconfig	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2011-10-26 15:39:02 +02:00
Makefile	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2011-10-26 15:39:02 +02:00