John W. Linville 63e35cd9bd Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h

2010-12-22 14:27:21 -05:00

..

acpi

Merge branch 'misc' into release

2010-10-26 14:51:00 -04:00

asm-generic

asm-generic/stat.h: support 64-bit file time_t for stat()

2010-11-01 15:31:29 -04:00

crypto

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

drm

drm/ttm: Be consistent on ttm_bo_init() failures

2010-11-10 11:52:19 +10:00

keys

DNS: Separate out CIFS DNS Resolver code

2010-08-05 17:17:51 +00:00

linux

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-12-22 14:27:21 -05:00

math-emu

math-emu: correct test for downshifting fraction in _FP_FROM_INT()

2010-07-20 18:45:14 -07:00

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2010-10-28 09:35:11 -07:00

mtd

mtd: Define MLC Flash as a different flash type

2010-10-25 00:50:20 +01:00

net

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-12-22 14:27:21 -05:00

pcmcia

pcmcia: IOCARD is also required for using IRQs

2010-10-22 08:46:36 +02:00

rdma

IB/core: Add VLAN support for IBoE

2010-10-25 10:20:39 -07:00

rxrpc

net: use __packed annotation

2010-06-03 03:21:52 -07:00

scsi

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

2010-10-31 20:43:12 -04:00

sound

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

2010-10-25 08:32:05 -07:00

trace

ext4: Add new ext4 inode tracepoints

2010-11-08 13:51:33 -05:00

video

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

2010-10-28 20:14:38 +01:00

xen

Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2010-10-28 17:11:17 -07:00

Kbuild

…