John W. Linville 3b51cc996e Merge branch 'master' into for-davem ...

Conflicts:
	drivers/net/wireless/ath/ath9k/phy.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-debugfs.c

2010-04-23 14:43:45 -04:00

..

acpi

acpi: Support IBM SMBus CMI devices

2010-03-24 14:38:37 +01:00

asm-generic

…

crypto

…

drm

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2010-04-19 07:27:06 -07:00

keys

…

linux

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

math-emu

…

media

…

mtd

…

net

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

pcmcia

pcmcia: use dev_pm_ops for class pcmcia_socket_class

2010-03-24 11:00:11 +01:00

rdma

…

rxrpc

…

scsi

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sound

Merge branch 'fix/asoc' into for-linus

2010-04-07 09:54:41 +02:00

trace

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

2010-04-09 11:50:29 -07:00

video

…

xen

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Kbuild

…