1
linux/drivers
Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next
Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.
2010-12-22 18:57:02 +01:00
..
accessibility
acpi Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
amba
ata Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
atm Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
auxdisplay
base Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
block Fix build error in drivers/block/cciss.c 2010-12-20 21:21:49 -08:00
bluetooth Bluetooth: Add new PID for Atheros 3011 2010-12-01 15:51:01 -02:00
cdrom
char agp/intel: Fix wrong kunmap in i830_cleanup() 2010-12-05 10:40:17 +00:00
clocksource clocksource: sh_cmt: Remove nested spinlock fix 2010-12-17 19:38:33 +09:00
connector connector: add module alias 2010-12-10 12:27:49 -08:00
cpufreq
cpuidle
crypto
dca
dio
dma Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
edac Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
eisa
firewire firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI 2010-12-12 15:47:02 +01:00
firmware
gpio cs5535-gpio: apply CS5536 errata workaround for GPIOs 2010-12-02 14:51:15 -08:00
gpu Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
hid Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 2010-12-02 17:40:04 -08:00
hwmon Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging 2010-12-14 13:36:26 -08:00
i2c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
ide
idle intel_idle: recognize ARAT on WSM-EX 2010-12-02 01:19:32 -05:00
ieee802154
infiniband Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
input Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
isdn Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
leds leds: fix up dependencies 2010-12-02 14:51:15 -08:00
lguest
macintosh Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
mca
md Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 2010-12-20 09:19:46 -08:00
media Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
memstick
message Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
mfd
misc Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
mmc Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
mtd Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
net Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
nubus
of
oprofile
parisc parisc: KittyHawk LCD fix 2010-12-04 11:18:25 -05:00
parport
pci Merge branches 'x86-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-12-19 10:44:54 -08:00
pcmcia Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
platform Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
pnp ACPI/PNP: avoid section mismatch warning 2010-12-11 02:01:47 -05:00
power
pps
ps3
rapidio
regulator regulator: tps6586x: correct register table 2010-12-09 09:23:43 +00:00
rtc
s390 Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
sbus
scsi Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
serial Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb 2010-12-14 14:35:04 -08:00
sfi
sh Merge branch 'common/clkfwk' into sh-fixes-for-linus 2010-11-19 16:43:23 +09:00
sn
spi Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
ssb ssb: b43-pci-bridge: Add new vendor for BCM4318 2010-11-22 15:19:31 -05:00
staging Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
tc
telephony
thermal
tty n_gsm: gsm_data_alloc buffer allocation could fail and it is not being checked 2010-12-16 13:03:13 -08:00
uio
usb Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
uwb
vhost vhost: correctly set bits of dirty pages 2010-11-29 10:26:55 +02:00
video Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
virtio virtio: fix format of sysfs driver/vendor files 2010-11-24 15:21:12 +10:30
vlynq
w1
watchdog watchdog: it8712f_wdt: add note to Kconfig 2010-12-02 14:10:32 +00:00
xen Merge branch '2.6.37-rc4-pvhvm-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm 2010-12-03 11:30:57 -08:00
zorro BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
Kconfig
Makefile