John W. Linville 7eab0f64a9 Merge branch 'master' into for-davem ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	net/wireless/nl80211.c

2012-04-12 14:41:59 -04:00

..

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-03-30 16:45:39 -07:00

asm-generic

asm-generic: add linux/types.h to cmpxchg.h

2012-04-02 14:41:27 -07:00

crypto

crypto: user - Fix lookup of algorithms with IV generator

2012-03-29 19:52:47 +08:00

drm

Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux

2012-04-03 10:13:34 -07:00

keys

…

linux

Merge branch 'master' into for-davem

2012-04-12 14:41:59 -04:00

math-emu

…

media

…

misc

…

mtd

…

net

Merge branch 'master' into for-davem

2012-04-12 14:41:59 -04:00

pcmcia

…

rdma

…

rxrpc

…

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2012-03-31 13:31:23 -07:00

sound

…

target

…

trace

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-04-04 10:04:42 -07:00

video

Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm

2012-03-27 18:17:02 -07:00

xen

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

Kbuild

…