John W. Linville 4d8b61490c Merge branch 'master' of git://git.infradead.org/users/linville/wireless ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

2011-09-20 14:11:55 -04:00

..

acpi

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

asm-generic

Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-26 17:12:10 -07:00

crypto

net: remove mm.h inclusion from netdevice.h

2011-06-21 19:17:20 -07:00

drm

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

keys

encrypted-keys: add key format support

2011-06-27 09:10:45 -04:00

linux

cfg80211/nl80211: Add PMKSA caching candidate event

2011-09-19 16:10:14 -04:00

math-emu

…

media

[media] tuner-core/v4l2-subdev: document that the type field has to be filled in

2011-07-07 15:04:23 -03:00

mtd

UBI: fix minor stylistic issues

2011-04-14 11:34:41 +03:00

net

Merge branch 'master' of git://git.infradead.org/users/linville/wireless

2011-09-20 14:11:55 -04:00

pcmcia

pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3

2011-08-08 16:04:11 -04:00

rdma

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

rxrpc

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

scsi

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2011-07-27 13:21:40 -07:00

sound

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

2011-07-27 09:25:15 -07:00

target

target: Bump version to v4.1.0-rc1-ml

2011-07-22 09:37:49 +00:00

trace

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

2011-07-26 11:34:40 -07:00

video

Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

2011-05-24 15:49:57 +09:00

xen

xen/balloon: memory hotplug support for Xen balloon driver

2011-07-25 20:57:08 -07:00

Kbuild

…