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	dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h	2010-03-12 15:52:42 -08:00
crypto	crypto: md5 - Add export support	2010-01-17 21:55:31 +11:00
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	Fix misspellings of "truly" in comments.	2010-02-04 11:55:45 +01:00
media	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
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	Merge branch 'misc' into for-next	2010-03-01 23:52:31 -08:00
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	broadsheetfb: support storing waveform	2010-03-12 15:52:34 -08:00
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	…