Linus Torvalds 02ebbbd481 Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild ... * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: scsi: drop unused Kconfig symbol pci: drop unused Kconfig symbol stmmac: drop unused Kconfig symbol x86: drop unused Kconfig symbol powerpc: drop unused Kconfig symbols powerpc: 40x: drop unused Kconfig symbol mips: drop unused Kconfig symbols openrisc: drop unused Kconfig symbols arm: at91: drop unused Kconfig symbol samples: drop unused Kconfig symbol m32r: drop unused Kconfig symbol score: drop unused Kconfig symbols sh: drop unused Kconfig symbol um: drop unused Kconfig symbol sparc: drop unused Kconfig symbol alpha: drop unused Kconfig symbol Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig as per Michal: the STMMAC_DUAL_MAC config variable is still unused and should be deleted.		2011-11-06 18:54:53 -08:00
..
accessibility
acpi	ACPI / PM: Add Sony VPCEB17FX to nonvs blacklist	2011-11-04 22:28:09 +01:00
amba
ata	ahci: add DT binding for Calxeda AHCI controller	2011-11-03 15:52:38 -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 / Runtime: Automatically retry failed autosuspends	2011-11-04 22:28:14 +01:00
bcma
block	Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-11-06 18:31:36 -08:00
bluetooth	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2011-10-25 15:18:39 +02:00
cdrom
char	Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux	2011-11-02 16:52:17 -07:00
clk
clocksource	Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:18:05 -07:00
connector
cpufreq	Merge branch 'next' of git://github.com/kernelslacker/cpufreq	2011-11-03 09:59:39 -07:00
cpuidle
crypto	crypto: talitos - handle descriptor not found in error path	2011-10-21 15:20:28 +02:00
dca
devfreq
dio
dma	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2011-11-04 18:02:25 -07:00
edac	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-11-06 17:12:03 -08:00
eisa
firewire	firewire: ohci: fix isochronous DMA synchronization	2011-10-18 12:32:39 +02:00
firmware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-11-05 15:32:53 -07:00
gpio	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-11-06 17:12:03 -08:00
gpu	Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux	2011-10-28 05:54:23 -07:00
hid	hid/apple: modern macbook airs use the standard apple function key translations	2011-11-06 18:34:03 -08:00
hv
hwmon	hwmon: (w83627ehf) Fix broken driver init	2011-11-06 20:25:18 +01:00
hwspinlock
i2c	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2011-11-03 13:28:14 -07:00
ide	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2011-11-03 13:28:14 -07:00
idle
ieee802154
infiniband	Merge branches 'iser', 'mthca' and 'qib' into for-next	2011-11-04 09:36:04 -07:00
input	Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6	2011-11-03 09:40:51 -07:00
iommu	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	2011-10-30 15:46:19 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-03 21:05:43 -07:00
leds	Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6	2011-11-03 09:40:51 -07:00
lguest	lguest: move process freezing before pending signals check	2011-10-27 10:56:18 +10:30
macintosh
mca
md	Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block	2011-11-04 17:06:58 -07:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2011-11-04 07:58:25 -07:00
memstick
message
mfd	Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6	2011-11-03 09:40:51 -07:00
misc	drivers/misc/vmw_balloon.c: fix typo in code comment	2011-11-02 16:07:03 -07:00
mmc	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2011-11-04 18:02:25 -07:00
mtd	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2011-11-03 13:28:14 -07:00
net	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
nfc
nubus
of	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-11-06 17:12:03 -08:00
oprofile
parisc
parport	parport_pc: release IO region properly if unsupported ITE887x card is found	2011-10-18 14:17:40 -07:00
pci	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
pcmcia	ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver	2011-11-05 22:26:46 +00:00
pinctrl	pinctrl/sirf: fix sirfsoc_get_group_pins prototype	2011-10-25 10:43:57 +02:00
platform	Merge branch 'akpm' (Andrew's incoming)	2011-10-31 17:46:07 -07:00
pnp
power	Merge branch 'akpm' (Andrew's incoming - part two)	2011-11-02 16:07:27 -07:00
pps	pps gpio client: add missing dependency	2011-11-02 16:07:02 -07:00
ps3
ptp
rapidio	RapidIO: fix potential null deref in rio_setup_device()	2011-11-02 16:07:01 -07:00
regulator	Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6	2011-11-03 09:40:51 -07:00
rtc	Merge branch 'akpm' (Andrew's incoming - part two)	2011-11-02 16:07:27 -07:00
s390	Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block	2011-11-04 17:06:58 -07:00
sbus
scsi	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
sfi
sh	sh: intc: Allow triggering on both edges for ARM SoCs	2011-11-05 00:57:48 +09:00
sn
spi	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2011-11-04 18:02:25 -07:00
ssb
staging	Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block	2011-11-04 17:06:58 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
tc
telephony
thermal
tty	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-11-06 17:12:03 -08:00
uio	uio: Support physical addresses >32 bits on 32-bit systems	2011-10-18 11:18:57 -07:00
usb	USB: Update last_busy time after autosuspend fails	2011-11-04 22:28:14 +01:00
uwb
vhost
video	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2011-11-03 13:28:14 -07:00
virt
virtio	virtio: Add platform bus driver for memory mapped virtio device	2011-11-02 11:41:01 +10:30
vlynq
w1	w1: disable irqs in critical section	2011-11-02 16:07:03 -07:00
watchdog	watchdog: Convert wm831x driver to watchdog core	2011-11-05 21:28:59 +01:00
xen	Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-11-06 18:31:36 -08:00
zorro	zorro: Fix four checkpatch warnings	2011-10-24 21:00:34 +02: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