Mark Brown d5381e42f6 ASoC: Merge branch 'for-2.6.39' into for-2.6.40 ... Fix trivial conflict caused by silly spelling fix patch. Conflicts: sound/soc/codecs/wm8994.c		2011-04-18 18:07:43 +01:00
..
accessibility
acpi
amba
ata
atm
auxdisplay
base
block
bluetooth
cdrom
char
clk
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma	Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6	2011-04-11 15:44:38 -07:00
edac
eisa
firewire
firmware
gpio	Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6	2011-04-11 15:44:38 -07:00
gpu
hid
hwmon
hwspinlock
i2c
ide
idle
ieee802154
infiniband
input
isdn
leds
lguest
macintosh
mca
md
media
memstick
message
mfd
misc
mmc
mtd	Merge git://git.infradead.org/mtd-2.6	2011-04-09 13:23:50 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 07:27:24 -07:00
nfc
nubus
of
oprofile
parisc
parport
pci	pci: fix PCI bus allocation alignment handling	2011-04-11 10:53:11 -07:00
pcmcia
platform
pnp
power
pps
ps3
rapidio
regulator
rtc	Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for-linus', 'irq-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-04-07 12:12:58 -07:00
s390	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2011-04-08 07:36:14 -07:00
sbus
scsi
sfi
sh
sn
spi	Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6	2011-04-11 15:44:38 -07:00
ssb
staging	ASoC: Merge branch 'for-2.6.39' into for-2.6.40	2011-04-18 18:07:43 +01:00
target
tc
telephony
thermal
tty	Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-04-07 12:48:45 -07:00
uio
usb
uwb
vhost
video	Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6	2011-04-07 12:49:17 -07:00
virtio
vlynq
w1
watchdog	watchdog: mpc8xxx_wdt: fix build	2011-04-07 20:20:24 +00:00
xen
zorro
Kconfig
Makefile